ToolTech/bpmc
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
hanjian 2024-09-02 20:59:57 +08:00
parent 6def8a39d3
commit fd7fc372a1
8 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebpm-process-manage/webapp/pages/trace/traceByText.jsp
View File

@ -154,7 +154,7 @@
<td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss", <td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss",
historicTaskInstance.getStartTime())%></td> 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())){ if(!StringUtils.isEmpty(historicTaskInstance.getDeleteReason())&&"cancel_process".equals(historicTaskInstance.getActionType())){
String cancelCommentMsg="当前流程已作废"; String cancelCommentMsg="当前流程已作废";
fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg); fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg);

2
ebpm-process-manage/webapp/pages/trace/traceImage.jsp
View File

@ -312,7 +312,7 @@
} }
html.push('<tr>'); html.push('<tr>');
html.push('<td class="clum">审批意见: </td>'); 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=""; var shortCommentMsg="";
if(item.historicTaskInstance.deleteReason!=null&&"cancel_process"==item.historicTaskInstance.actionType){ if(item.historicTaskInstance.deleteReason!=null&&"cancel_process"==item.historicTaskInstance.actionType){
var cancelCommentMsg="当前流程已作废,作废意见为:"+item.historicTaskInstance.deleteReason; var cancelCommentMsg="当前流程已作废,作废意见为:"+item.historicTaskInstance.deleteReason;

4
ebpm-process-manage/webapp/pages/trace/traceImageAndText.jsp
View File

@ -148,7 +148,7 @@ function showSubActivityDetal(topId){
<th width="15%">处理环节</th> <th width="15%">处理环节</th>
<th width="15%">处理人</th> <th width="15%">处理人</th>
<th width="12%">处理时间</th> <th width="12%">处理时间</th>
<th >处理意见</th> <th >处理意见2222</th>
<th width="15%">接收环节</th> <th width="15%">接收环节</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", <td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss",
historicTaskInstance.getStartTime())%></td> 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())){ if(!StringUtils.isEmpty(historicTaskInstance.getDeleteReason())&&"cancel_process".equals(historicTaskInstance.getActionType())){
String cancelCommentMsg="当前流程已作废"; String cancelCommentMsg="当前流程已作废";
fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg); fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg);

2
ebpm-process-modeler/.env.development
View File

@ -1 +1 @@
VUE_APP_BASE_EBPM_PATH = 'http://localhost:8085/ebpm-process-manage' VUE_APP_BASE_EBPM_PATH = '/ebpm-process-manage'

2
ebpm-process-modeler/.env.production
View File

@ -1 +1 @@
VUE_APP_BASE_EBPM_PATH = 'https://www.rzdata.net/ebpm-process-manage' VUE_APP_BASE_EBPM_PATH = '/ebpm-process-manage'

2
ebpm-process-modeler/.env.staging
View File

@ -1 +1 @@
VUE_APP_BASE_EBPM_PATH = 'http://192.168.2.128:8080/ebpm-process-manage' VUE_APP_BASE_EBPM_PATH = '/ebpm-process-manage'

8
ebpm-process-modeler/default.conf
View File

@ -11,6 +11,14 @@ server {
try_files $uri $uri/ /index.html; 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 { location ^~/ebpm-process-modeler {
alias /usr/share/nginx/html/ebpm-process-modeler; alias /usr/share/nginx/html/ebpm-process-modeler;
index index.html index.htm; index index.html index.htm;

6
ebpm-process-rest/src/main/resources/application.properties
View File

@ -8,9 +8,9 @@ server.servlet.encoding.force=true
server.servlet.encoding.enabled=true server.servlet.encoding.enabled=true
spring.datasource.driver-class-name=com.mysql.jdbc.Driver 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.url=jdbc:mysql://192.168.1.168:3307/tool_tech_bpmc?useUnicode=true&characterEncoding=UTF-8
spring.datasource.username=dzy spring.datasource.username=tool_tech
spring.datasource.password=Dzy@1215 spring.datasource.password=Tooltech@123
spring.datasource.connectionTimeout=60000 spring.datasource.connectionTimeout=60000
spring.datasource.idleTimeout=600000 spring.datasource.idleTimeout=600000
spring.datasource.validationTimeout=3000 spring.datasource.validationTimeout=3000