Merge branch 'feat/guava' into 'develop'

默认缓存策略改为guava

See merge request o2oa/o2oa!276

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Cache.java

@@ -17,7 +17,7 @@ public class Cache extends ConfigObject {
 	}
 
 	public Cache() {
-		this.type = TYPE_EHCACHE;
+		this.type = TYPE_GUAVA;
 		this.redis = Redis.defaultInstance();
 		this.ehcache = Ehcache.defaultInstance();
 		this.guava = Guava.defaultInstance();