修正冲突

.gitignore

@@ -4,4 +4,4 @@
 .project
 /.settings/
 /target/
-/.svn/
+/.svn/

README.md

@@ -3,7 +3,6 @@ O2OA
 ## 简介
 
 O2OA 是一套现代企业级的办公平台。有以下特点\:
- 
 
 1. 核心代码开源
 

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

o2web/.gitignore

@@ -0,0 +1,5 @@
+/.idea/
+/dest/
+/node_modules/
+npm-debug.log
+/.svn/

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;
-});
+});