diff --git a/CicadasCms/src/main/java/com/zhiliao/common/aop/LogAspect.java b/CicadasCms/src/main/java/com/zhiliao/common/aop/LogAspect.java
index 661b6221f30005ff9fe81a2a942217166a16fd59..deb940fae96c34ceefd18aa45b7db08bef257886 100644
--- a/CicadasCms/src/main/java/com/zhiliao/common/aop/LogAspect.java
+++ b/CicadasCms/src/main/java/com/zhiliao/common/aop/LogAspect.java
@@ -46,8 +46,8 @@ public class LogAspect {
String principal =(String) session.getAttribute("username");
if(StrUtil.isBlank(principal))
principal = " - ";
- logger.info("@Syslog value : {} username:{}",log.value());
if (log != null) {
+ logger.info("@Syslog value : {} username:{}",log.value());
String content =buildeContent(joinPoint, methodName, request);
logService.saveLog(content,new Date(),principal,log.value());
}
diff --git a/CicadasCms/src/main/java/com/zhiliao/common/keyword/SensitiveWordInit.java b/CicadasCms/src/main/java/com/zhiliao/common/keyword/SensitiveWordInit.java
index 8e2a4ed704559a1fa87e1cd91c66e01bd3619160..97ab56489605e06639ab31ee5edee1af3fb28bac 100644
--- a/CicadasCms/src/main/java/com/zhiliao/common/keyword/SensitiveWordInit.java
+++ b/CicadasCms/src/main/java/com/zhiliao/common/keyword/SensitiveWordInit.java
@@ -116,7 +116,11 @@ public class SensitiveWordInit {
} catch (Exception e) {
throw e;
}finally{
- read.close();
+ try{
+ read.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
return set;
}
diff --git a/CicadasCms/src/main/java/com/zhiliao/common/utils/ControllerUtil.java b/CicadasCms/src/main/java/com/zhiliao/common/utils/ControllerUtil.java
index 460097403779983c61a56e81a9ac321174ab4208..f3baaac883fb1a477de8c11fd8ba8cfaab0759ca 100644
--- a/CicadasCms/src/main/java/com/zhiliao/common/utils/ControllerUtil.java
+++ b/CicadasCms/src/main/java/com/zhiliao/common/utils/ControllerUtil.java
@@ -216,20 +216,20 @@ public class ControllerUtil {
boolean mobileFlag = false;
String via = request.getHeader("Via");
String userAgent = request.getHeader("user-agent");
- for (int i = 0; via != null && !via.trim().equals("") && i < mobileGateWayHeaders.length; i++) {
+ for (int i = 0; via != null && via.trim().length()!=0 && i < mobileGateWayHeaders.length; i++) {
if (via.contains(mobileGateWayHeaders[i])) {
mobileFlag = true;
break;
}
}
- for (int i = 0; !mobileFlag && userAgent != null && !userAgent.trim().equals("")
+ for (int i = 0; !mobileFlag && userAgent != null && userAgent.trim().length()!=0
&& i < mobileUserAgents.length; i++) {
if (userAgent.contains(mobileUserAgents[i])) {
mobileFlag = true;
break;
}
}
- for (int i = 0; userAgent != null && !userAgent.trim().equals("") && i < pcHeaders.length; i++) {
+ for (int i = 0; userAgent != null && userAgent.trim().length()!=0 && i < pcHeaders.length; i++) {
if (userAgent.contains(pcHeaders[i])) {
pcFlag = true;
break;
diff --git a/CicadasCms/src/main/java/com/zhiliao/component/lucene/LuceneManager.java b/CicadasCms/src/main/java/com/zhiliao/component/lucene/LuceneManager.java
index b3ea1c440c3c27b17337c6049b21675c2651f518..07bff78bfad817ef2e9b7148e339b8101924b4cc 100644
--- a/CicadasCms/src/main/java/com/zhiliao/component/lucene/LuceneManager.java
+++ b/CicadasCms/src/main/java/com/zhiliao/component/lucene/LuceneManager.java
@@ -71,19 +71,24 @@ public class LuceneManager {
indexWriter.commit();
} catch (Exception e) {
e.printStackTrace();
- try {
- indexWriter.rollback();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.rollback();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
}finally {
- try {
- indexWriter.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
+ if(indexWriter!=null){
+ try {
+ indexWriter.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
- }
+ }
+
+ }
/* 删除索引 */
@@ -96,16 +101,20 @@ public class LuceneManager {
log.info("deleted:{}",result);
} catch (Exception e) {
e.printStackTrace();
- try {
- indexWriter.rollback();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.rollback();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
} finally {
- try {
- indexWriter.close();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
}
}
@@ -122,16 +131,20 @@ public class LuceneManager {
log.info("deleted:{}",result);
} catch (Exception e) {
e.printStackTrace();
- try {
- indexWriter.rollback();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.rollback();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
} finally {
- try {
- indexWriter.close();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
}
}
@@ -147,16 +160,20 @@ public class LuceneManager {
indexWriter.updateDocument(new Term("id", indexObject.getId()),DocumentUtil.IndexObject2Document(indexObject));
} catch (Exception e) {
e.printStackTrace();
- try {
- indexWriter.rollback();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.rollback();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
} finally {
- try {
- indexWriter.close();
- } catch (IOException e1) {
- e1.printStackTrace();
+ if(indexWriter!=null){
+ try {
+ indexWriter.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
}
}
@@ -194,10 +211,12 @@ public class LuceneManager {
} catch (Exception e) {
e.printStackTrace();
}finally {
- try {
- indexReader.close();
- } catch (IOException e) {
- e.printStackTrace();
+ if(indexReader!=null){
+ try {
+ indexReader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
return pageQuery;
diff --git a/CicadasCms/src/main/java/com/zhiliao/component/oauth/util/StrKit.java b/CicadasCms/src/main/java/com/zhiliao/component/oauth/util/StrKit.java
index d8fd091ace8aebfd5825f719cd1b24f665e579d4..82a5092a9fd2f252e443e6b4fd0bd6641e16824c 100644
--- a/CicadasCms/src/main/java/com/zhiliao/component/oauth/util/StrKit.java
+++ b/CicadasCms/src/main/java/com/zhiliao/component/oauth/util/StrKit.java
@@ -12,7 +12,7 @@ public class StrKit {
public static boolean notBlank(String str) {
- return str != null || str.length() > 0;
+ return str != null && str.length() > 0;
}
public static String replace(String content) {
String word = content.replace("，", ",").trim();
diff --git a/CicadasCms/src/main/java/com/zhiliao/module/web/system/service/impl/RoleServiceImpl.java b/CicadasCms/src/main/java/com/zhiliao/module/web/system/service/impl/RoleServiceImpl.java
index 1e2754216950181a17f958a14aca3c1d5227a981..288c9f81332bf35e840ae8f4f427371b89725a4d 100644
--- a/CicadasCms/src/main/java/com/zhiliao/module/web/system/service/impl/RoleServiceImpl.java
+++ b/CicadasCms/src/main/java/com/zhiliao/module/web/system/service/impl/RoleServiceImpl.java
@@ -82,8 +82,8 @@ public class RoleServiceImpl implements RoleService {
@Override
@Transactional(transactionManager = "masterTransactionManager")
public String save(TSysRole role,Integer[] permissionId) {
- role.setRolename(PinyinUtil.convertLower(HtmlKit.getText(role.getRolename()).trim()));
if(role!=null){
+ role.setRolename(PinyinUtil.convertLower(HtmlKit.getText(role.getRolename()).trim()));
if(roleMapper.insert(role)>0)
if(permissionId!=null&&permissionId.length>0){
/* 遍历添加角色权限*/
diff --git a/CicadasCms/src/main/resources/com/zhiliao/mybatis/mapper/TCmsContentMapper.xml b/CicadasCms/src/main/resources/com/zhiliao/mybatis/mapper/TCmsContentMapper.xml
index 53a45f125cbea418183eb3b530c3f2809e6b65d1..8af2e28f3201b08b07654c98e0b79b7a71d32c9e 100644
--- a/CicadasCms/src/main/resources/com/zhiliao/mybatis/mapper/TCmsContentMapper.xml
+++ b/CicadasCms/src/main/resources/com/zhiliao/mybatis/mapper/TCmsContentMapper.xml
@@ -62,7 +62,7 @@
category_id = #{categoryId}
- and ${key} = ${value}
+ and ${key} = #{value}
@@ -91,7 +91,7 @@
- order by ${orderField} ${orderDirection}
+ order by #{orderField} #{orderDirection}
order by content_id DESC