public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-14 02:06:25 +00:00
Code Issues Releases Wiki Activity

enable cors

Browse Source
This commit is contained in:
Benjamin Gamard
2018-01-24 15:39:27 +01:00
parent d0646f12e6
commit 9ba49f35ff
5 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java
View File

@@ -1,17 +1,5 @@
package com.sismics.docs.core.dao.jpa;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import com.google.common.base.Joiner;
import com.sismics.docs.core.constant.AuditLogType;
import com.sismics.docs.core.dao.jpa.criteria.TagCriteria;
@@ -24,6 +12,11 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
import com.sismics.docs.core.util.jpa.SortCriteria;
import com.sismics.util.context.ThreadLocalContext;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import java.util.*;
/**
* Tag DAO.
*
@@ -204,7 +197,7 @@ public class TagDao {
}
if (criteria.getNameLike() != null) {
criteriaList.add("t.TAG_NAME_C like :nameLike");
parameterMap.put("nameLike", "%" + criteria.getNameLike() + "%");
parameterMap.put("nameLike", criteria.getNameLike() + "%");
}
criteriaList.add("t.TAG_DELETEDATE_D is null");

6
docs-core/src/main/java/com/sismics/util/EnvironmentUtil.java
View File

@@ -28,7 +28,7 @@ public class EnvironmentUtil {
* @return Running under Microsoft Windows
*/
public static boolean isWindows() {
return OS.indexOf("win") >= 0;
return OS.contains("win");
}
/**
@@ -37,7 +37,7 @@ public class EnvironmentUtil {
* @return Running under Mac OS
*/
public static boolean isMacOs() {
return OS.indexOf("mac") >= 0;
return OS.contains("mac");
}
/**
@@ -46,7 +46,7 @@ public class EnvironmentUtil {
* @return Running under UNIX
*/
public static boolean isUnix() {
return OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0;
return OS.contains("nix") || OS.contains("nux") || OS.contains("aix");
}
/**