diff --git a/.gitignore b/.gitignore
index a251ead90680f493a4a7a904e9bf155a27ae1e52..4cae7d4780744df5124fb044d7a47186ece6fa18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 .project
 /.settings/
 /target/
-/.svn/
\ No newline at end of file
+/.svn/
diff --git a/README.md b/README.md
index ff60b81f1bd04be0a2adfbe95313a671d935bdfd..da6791603733f52677e430332d76204ec9eb95b6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@ O2OA
 ## 简介
 
 O2OA 是一套现代企业级的办公平台。有以下特点\:
- 
 
 1. 核心代码开源
 
diff --git a/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/Entry_.java b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/Entry_.java
new file mode 100644
index 0000000000000000000000000000000000000000..eadc5a6b4f5c95abf4a9e8d3e168c67769555cef
--- /dev/null
+++ b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/Entry_.java
@@ -0,0 +1,27 @@
+/** 
+ *  Generated by OpenJPA MetaModel Generator Tool.
+**/
+
+package com.x.query.core.entity.neural;
+
+import com.x.base.core.entity.SliceJpaObject_;
+import java.lang.Integer;
+import java.lang.String;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+
+@javax.persistence.metamodel.StaticMetamodel
+(value=com.x.query.core.entity.neural.Entry.class)
+@javax.annotation.Generated
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Thu Dec 27 11:39:59 CST 2018")
+public class Entry_ extends SliceJpaObject_  {
+    public static volatile SingularAttribute<Entry,String> bundle;
+    public static volatile SingularAttribute<Entry,String> id;
+    public static volatile SingularAttribute<Entry,Integer> inValueCount;
+    public static volatile ListAttribute<Entry,Integer> inValueLabelList;
+    public static volatile SingularAttribute<Entry,Integer> outValueCount;
+    public static volatile ListAttribute<Entry,Integer> outValueLabelList;
+    public static volatile SingularAttribute<Entry,String> project;
+    public static volatile SingularAttribute<Entry,String> title;
+    public static volatile SingularAttribute<Entry,String> type;
+}
diff --git a/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/InText_.java b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/InText_.java
new file mode 100644
index 0000000000000000000000000000000000000000..711c0e1e27fd9e8ec50a973a671294138d502150
--- /dev/null
+++ b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/InText_.java
@@ -0,0 +1,22 @@
+/** 
+ *  Generated by OpenJPA MetaModel Generator Tool.
+**/
+
+package com.x.query.core.entity.neural;
+
+import com.x.base.core.entity.SliceJpaObject_;
+import java.lang.Integer;
+import java.lang.String;
+import javax.persistence.metamodel.SingularAttribute;
+
+@javax.persistence.metamodel.StaticMetamodel
+(value=com.x.query.core.entity.neural.InText.class)
+@javax.annotation.Generated
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Thu Dec 27 11:39:59 CST 2018")
+public class InText_ extends SliceJpaObject_  {
+    public static volatile SingularAttribute<InText,Integer> count;
+    public static volatile SingularAttribute<InText,String> id;
+    public static volatile SingularAttribute<InText,String> project;
+    public static volatile SingularAttribute<InText,Integer> serial;
+    public static volatile SingularAttribute<InText,String> text;
+}
diff --git a/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/InValue_.java b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/InValue_.java
new file mode 100644
index 0000000000000000000000000000000000000000..329afa0adced3890ad2015f84ee174a8f4e57414
--- /dev/null
+++ b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/InValue_.java
@@ -0,0 +1,23 @@
+/** 
+ *  Generated by OpenJPA MetaModel Generator Tool.
+**/
+
+package com.x.query.core.entity.neural;
+
+import com.x.base.core.entity.SliceJpaObject_;
+import java.lang.Integer;
+import java.lang.String;
+import javax.persistence.metamodel.SingularAttribute;
+
+@javax.persistence.metamodel.StaticMetamodel
+(value=com.x.query.core.entity.neural.InValue.class)
+@javax.annotation.Generated
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Thu Dec 27 11:39:59 CST 2018")
+public class InValue_ extends SliceJpaObject_  {
+    public static volatile SingularAttribute<InValue,Integer> count;
+    public static volatile SingularAttribute<InValue,String> id;
+    public static volatile SingularAttribute<InValue,Integer> inTextSerial;
+    public static volatile SingularAttribute<InValue,String> project;
+    public static volatile SingularAttribute<InValue,Integer> serial;
+    public static volatile SingularAttribute<InValue,String> text;
+}
diff --git a/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/OutText_.java b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/OutText_.java
new file mode 100644
index 0000000000000000000000000000000000000000..c46819990e61acdfd74c3d43765928d1b1aa08a9
--- /dev/null
+++ b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/OutText_.java
@@ -0,0 +1,22 @@
+/** 
+ *  Generated by OpenJPA MetaModel Generator Tool.
+**/
+
+package com.x.query.core.entity.neural;
+
+import com.x.base.core.entity.SliceJpaObject_;
+import java.lang.Integer;
+import java.lang.String;
+import javax.persistence.metamodel.SingularAttribute;
+
+@javax.persistence.metamodel.StaticMetamodel
+(value=com.x.query.core.entity.neural.OutText.class)
+@javax.annotation.Generated
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Thu Dec 27 11:39:59 CST 2018")
+public class OutText_ extends SliceJpaObject_  {
+    public static volatile SingularAttribute<OutText,Integer> count;
+    public static volatile SingularAttribute<OutText,String> id;
+    public static volatile SingularAttribute<OutText,String> project;
+    public static volatile SingularAttribute<OutText,Integer> serial;
+    public static volatile SingularAttribute<OutText,String> text;
+}
diff --git a/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/OutValue_.java b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/OutValue_.java
new file mode 100644
index 0000000000000000000000000000000000000000..2baec620d06b1f8313f3086974c7ea2a8d757cb8
--- /dev/null
+++ b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/OutValue_.java
@@ -0,0 +1,22 @@
+/** 
+ *  Generated by OpenJPA MetaModel Generator Tool.
+**/
+
+package com.x.query.core.entity.neural;
+
+import com.x.base.core.entity.SliceJpaObject_;
+import java.lang.Integer;
+import java.lang.String;
+import javax.persistence.metamodel.SingularAttribute;
+
+@javax.persistence.metamodel.StaticMetamodel
+(value=com.x.query.core.entity.neural.OutValue.class)
+@javax.annotation.Generated
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Thu Dec 27 11:39:59 CST 2018")
+public class OutValue_ extends SliceJpaObject_  {
+    public static volatile SingularAttribute<OutValue,Integer> count;
+    public static volatile SingularAttribute<OutValue,String> id;
+    public static volatile SingularAttribute<OutValue,String> project;
+    public static volatile SingularAttribute<OutValue,Integer> serial;
+    public static volatile SingularAttribute<OutValue,String> text;
+}
diff --git a/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/Project_.java b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/Project_.java
new file mode 100644
index 0000000000000000000000000000000000000000..4954abc4c5213c645679ec80828011fa13675a85
--- /dev/null
+++ b/o2server/x_query_core_entity/src/main/java/com/x/query/core/entity/neural/Project_.java
@@ -0,0 +1,51 @@
+/** 
+ *  Generated by OpenJPA MetaModel Generator Tool.
+**/
+
+package com.x.query.core.entity.neural;
+
+import com.x.base.core.entity.SliceJpaObject_;
+import com.x.base.core.entity.StringValueMap;
+import java.lang.Double;
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+
+@javax.persistence.metamodel.StaticMetamodel
+(value=com.x.query.core.entity.neural.Project.class)
+@javax.annotation.Generated
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Thu Dec 27 11:39:59 CST 2018")
+public class Project_ extends SliceJpaObject_  {
+    public static volatile SingularAttribute<Project,String> alias;
+    public static volatile SingularAttribute<Project,String> analyzeType;
+    public static volatile ListAttribute<Project,String> applicationList;
+    public static volatile SingularAttribute<Project,String> attachmentScriptText;
+    public static volatile SingularAttribute<Project,String> description;
+    public static volatile SingularAttribute<Project,Integer> effectiveEntryCount;
+    public static volatile SingularAttribute<Project,Date> endDate;
+    public static volatile SingularAttribute<Project,Integer> entryCount;
+    public static volatile SingularAttribute<Project,Integer> generateInTextCutoffSize;
+    public static volatile SingularAttribute<Project,Integer> generatingPercent;
+    public static volatile SingularAttribute<Project,String> id;
+    public static volatile SingularAttribute<Project,Integer> inValueCount;
+    public static volatile SingularAttribute<Project,String> inValueScriptText;
+    public static volatile SingularAttribute<Project,String> intermediateNnet;
+    public static volatile SingularAttribute<Project,Integer> learnEntryCount;
+    public static volatile SingularAttribute<Project,Integer> learnInTextCutoffSize;
+    public static volatile SingularAttribute<Project,Integer> maxResult;
+    public static volatile SingularAttribute<Project,String> name;
+    public static volatile SingularAttribute<Project,String> neuralNetworkType;
+    public static volatile SingularAttribute<Project,String> nnet;
+    public static volatile SingularAttribute<Project,Integer> outValueCount;
+    public static volatile SingularAttribute<Project,String> outValueScriptText;
+    public static volatile ListAttribute<Project,String> processList;
+    public static volatile SingularAttribute<Project,StringValueMap> propertyMap;
+    public static volatile SingularAttribute<Project,Date> startDate;
+    public static volatile SingularAttribute<Project,String> status;
+    public static volatile SingularAttribute<Project,Double> totalError;
+    public static volatile SingularAttribute<Project,String> type;
+    public static volatile SingularAttribute<Project,Integer> validationEntryCount;
+    public static volatile SingularAttribute<Project,Double> validationMeanSquareError;
+}
diff --git a/o2web/.gitignore b/o2web/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f47d1983fb5c57309c8fdb00b134fb025fd11acd
--- /dev/null
+++ b/o2web/.gitignore
@@ -0,0 +1,5 @@
+/.idea/
+/dest/
+/node_modules/
+npm-debug.log
+/.svn/
\ No newline at end of file
diff --git a/o2web/source/o2_core/compatible.js b/o2web/source/o2_core/compatible.js
index c0c37f6e86a9ffba16fbc6993d80cd83801f221a..9ce47bd228d74f3f8e998a9e60a8c3e2b66be201 100644
--- a/o2web/source/o2_core/compatible.js
+++ b/o2web/source/o2_core/compatible.js
@@ -25,4 +25,4 @@ o2.addReady(function(){
     MWF.getJSON = o2.JSON.get;
     MWF.getJSONP = o2.JSON.getJsonp;
     MWF.defaultPath = o2.session.path;
-});
\ No newline at end of file
+});