fix head_location

o2server/.gitignore

+/graalvm.sh
+/test.sh

o2server/configSample/collect.json

@@ -10,6 +10,7 @@
   "sslEnable": false,
   "appPackServerHost": "apppack.o2oa.net",
   "appPackServerPort": 30088.0,
+  "isAppPackCoverAppUrl": false,
   "###enable": "是否启用连接到云平台###",
   "###name": "云平台账户名称,同时显示在登录页面底部.###",
   "###password": "云平台密码###",
@@ -22,5 +23,6 @@
   "###secret": "推送消息secret###",
   "###key": "推送消息key###",
   "###appPackServerHost": "app打包服务器域名###",
-  "###appPackServerPort": "app打包服务器端口###"
+  "###appPackServerPort": "app打包服务器端口###",
+  "###isAppPackCoverAppUrl": "是否用app打包的地址覆盖o2oa的appUrl###"
 }
\ No newline at end of file

o2server/configSample/person.json

@@ -20,7 +20,7 @@
   "###bindLogin": "是否启用扫描二维码登录,默认值:false###",
   "###faceLogin": "是否启用刷脸登录,默认值:false###",
   "###password": "注册初始密码,使用()调用脚本生成初始密码,默认为:(var v \\u003d person.getMobile();\\u000a return v.substring(v.length - 6))###",
-  "###passwordPeriod": "密码过期时间(天),0表示不过期(只对新用户有效),-1表示永不过期(对所有用户有效),默认值:0.###",
+  "###passwordPeriod": "密码过期时间(天),0表示永不过期,默认值:0.###",
   "###passwordRegex": "密码校验正则表达式,默认6位以上,包含数字和字母.###",
   "###passwordRegexHint": "密码校验不通过的提示信息.###",
   "###register": "是否允许用户自注册,disable:不允许,captcha通过验证码注册,code:通过短信注册,默认值:disable###",

o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/ConnectionAction.java

@@ -53,6 +53,8 @@ public class ConnectionAction {
 	public static final String METHOD_GET = "GET";
 	public static final String METHOD_DELETE = "DELETE";
 
+	public static final String HEAD_LOCATION = "location";
+
 	private static Gson gson = XGsonBuilder.instance();
 
 	private static ActionResponse getDelete(int connectTimeout, int readTimeout, String address, String method,

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/AssignData.java

+package com.x.processplatform.service.processing.processor.embed;
+
+import java.util.List;
+
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.processplatform.core.entity.content.Attachment;
+import com.x.processplatform.core.entity.content.Data;
+
+/**
+ * 创建流程实例使用的传参对象
+ * 
+ * @author ray
+ *
+ */
+class AssignData extends GsonPropertyObject {
+
+	private String application;
+
+	private String process;
+
+	private String identity;
+
+	private Data data;
+
+	private List<Attachment> attachmentList;
+
+	private Boolean processing;
+
+	private String title;
+
+	public String getApplication() {
+		return application;
+	}
+
+	public void setApplication(String application) {
+		this.application = application;
+	}
+
+	public String getProcess() {
+		return process;
+	}
+
+	public void setProcess(String process) {
+		this.process = process;
+	}
+
+	public Data getData() {
+		return data;
+	}
+
+	public void setData(Data data) {
+		this.data = data;
+	}
+
+	public List<Attachment> getAttachmentList() {
+		return attachmentList;
+	}
+
+	public void setAttachmentList(List<Attachment> attachmentList) {
+		this.attachmentList = attachmentList;
+	}
+
+	public Boolean getProcessing() {
+		return processing;
+	}
+
+	public void setProcessing(Boolean processing) {
+		this.processing = processing;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getIdentity() {
+		return identity;
+	}
+
+	public void setIdentity(String identity) {
+		this.identity = identity;
+	}
+
+}