diff --git a/ebpm-process-manage/webapp/pages/trace/traceByText.jsp b/ebpm-process-manage/webapp/pages/trace/traceByText.jsp
index 0ac4df7..9086885 100644
--- a/ebpm-process-manage/webapp/pages/trace/traceByText.jsp
+++ b/ebpm-process-manage/webapp/pages/trace/traceByText.jsp
@@ -154,7 +154,7 @@
 							<td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss",
 									historicTaskInstance.getStartTime())%></td>
 							<%
-								String fullCommentMsg = (comment!=null&&comment.getFullMessage()!=null? comment.getFullMessage() : "");
+								String fullCommentMsg = (comment!=null&&comment.getMessage()!=null? comment.getMessage() : "");
 								if(!StringUtils.isEmpty(historicTaskInstance.getDeleteReason())&&"cancel_process".equals(historicTaskInstance.getActionType())){
 									String cancelCommentMsg="当前流程已作废";
 									fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg);
diff --git a/ebpm-process-manage/webapp/pages/trace/traceImage.jsp b/ebpm-process-manage/webapp/pages/trace/traceImage.jsp
index 922d2b3..19f27c3 100644
--- a/ebpm-process-manage/webapp/pages/trace/traceImage.jsp
+++ b/ebpm-process-manage/webapp/pages/trace/traceImage.jsp
@@ -312,7 +312,7 @@
             }
             html.push('<tr>');
             html.push('<td class="clum">审批意见: </td>');
-            var fullCommentMsg = item.comment!=null&&item.comment.fullMessage!=null? item.comment.fullMessage : "";
+            var fullCommentMsg = item.comment!=null&&item.comment.message!=null? item.comment.message : "";
             var shortCommentMsg="";
             if(item.historicTaskInstance.deleteReason!=null&&"cancel_process"==item.historicTaskInstance.actionType){
                 var cancelCommentMsg="当前流程已作废,作废意见为:"+item.historicTaskInstance.deleteReason;
diff --git a/ebpm-process-manage/webapp/pages/trace/traceImageAndText.jsp b/ebpm-process-manage/webapp/pages/trace/traceImageAndText.jsp
index 8ef62b3..b9f907b 100644
--- a/ebpm-process-manage/webapp/pages/trace/traceImageAndText.jsp
+++ b/ebpm-process-manage/webapp/pages/trace/traceImageAndText.jsp
@@ -148,7 +148,7 @@ function showSubActivityDetal(topId){
 														  	<th width="15%">处理环节</th>
 														  	<th width="15%">处理人</th>
 														  	<th width="12%">处理时间</th>
-															<th >处理意见</th>
+															<th >处理意见2222</th>
 															
 															<th width="15%">接收环节</th>
 															<th width="15%">接收人</th>
@@ -182,7 +182,7 @@ function showSubActivityDetal(topId){
 																<td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss",
 																			historicTaskInstance.getStartTime())%></td>
 																<% 
-																    String fullCommentMsg = (comment!=null&&comment.getFullMessage()!=null? comment.getFullMessage() : "");
+																    String fullCommentMsg = (comment!=null&&comment.getMessage()!=null? comment.getMessage() : "");
 																	if(!StringUtils.isEmpty(historicTaskInstance.getDeleteReason())&&"cancel_process".equals(historicTaskInstance.getActionType())){
 																		String cancelCommentMsg="当前流程已作废";
 																		fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg);
diff --git a/ebpm-process-modeler/.env.development b/ebpm-process-modeler/.env.development
index 716a1a6..1f2131f 100644
--- a/ebpm-process-modeler/.env.development
+++ b/ebpm-process-modeler/.env.development
@@ -1 +1 @@
-VUE_APP_BASE_EBPM_PATH = 'http://localhost:8085/ebpm-process-manage'
+VUE_APP_BASE_EBPM_PATH = '/ebpm-process-manage'
diff --git a/ebpm-process-modeler/.env.production b/ebpm-process-modeler/.env.production
index 4ffe1cd..1f2131f 100644
--- a/ebpm-process-modeler/.env.production
+++ b/ebpm-process-modeler/.env.production
@@ -1 +1 @@
-VUE_APP_BASE_EBPM_PATH = 'https://www.rzdata.net/ebpm-process-manage'
\ No newline at end of file
+VUE_APP_BASE_EBPM_PATH = '/ebpm-process-manage'
diff --git a/ebpm-process-modeler/.env.staging b/ebpm-process-modeler/.env.staging
index cb56e07..1f2131f 100644
--- a/ebpm-process-modeler/.env.staging
+++ b/ebpm-process-modeler/.env.staging
@@ -1 +1 @@
-VUE_APP_BASE_EBPM_PATH = 'http://192.168.2.128:8080/ebpm-process-manage'
+VUE_APP_BASE_EBPM_PATH = '/ebpm-process-manage'
diff --git a/ebpm-process-modeler/default.conf b/ebpm-process-modeler/default.conf
index 3d32118..7a3b46b 100644
--- a/ebpm-process-modeler/default.conf
+++ b/ebpm-process-modeler/default.conf
@@ -11,6 +11,14 @@ server {
         try_files $uri $uri/ /index.html;
     }
 
+   location ^~/ebpm-process-manage/ {
+       proxy_pass https://117.78.50.82:18081/ebpm-process-manage/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
     location ^~/ebpm-process-modeler {
        alias /usr/share/nginx/html/ebpm-process-modeler;
        index  index.html index.htm;
diff --git a/ebpm-process-rest/src/main/resources/application.properties b/ebpm-process-rest/src/main/resources/application.properties
index 72baa83..17c0cb3 100644
--- a/ebpm-process-rest/src/main/resources/application.properties
+++ b/ebpm-process-rest/src/main/resources/application.properties
@@ -8,9 +8,9 @@ server.servlet.encoding.force=true
 server.servlet.encoding.enabled=true
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://192.168.1.168:3307/vazyme_bpm?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=dzy
-spring.datasource.password=Dzy@1215
+spring.datasource.url=jdbc:mysql://192.168.1.168:3307/tool_tech_bpmc?useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username=tool_tech
+spring.datasource.password=Tooltech@123
 spring.datasource.connectionTimeout=60000
 spring.datasource.idleTimeout=600000
 spring.datasource.validationTimeout=3000