文件ip迁移兼容

xiangpei

4 天以前 37325b5b629a296230e87d41187742f843c7494c

文件ip迁移兼容

 business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java

@@ -20,6 +20,7 @@
import com.ycl.common.enums.business.TaskStatusEnum;
import com.ycl.common.exception.CustomException;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.ProjectConstant;
import com.ycl.domain.dto.FlowCommentDto;
import com.ycl.domain.dto.FlowNextDto;
import com.ycl.domain.dto.FlowTaskDto;
@@ -72,6 +73,7 @@
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -108,6 +110,9 @@
    private final ProcessLogService processLogService;
    private final ApplicationEventPublisher publisher;
    private final ProjectProcessMapper projectProcessMapper;

    @Value("${targetIp}")
    private String targetIp;

    /**
     * 完成审核任务
@@ -1687,10 +1692,28 @@
                    for (JSONObject oldField : oldFields) {
                        JSONObject options = oldField.getJSONObject("options");
                        options.put("disabled", true);
                        // 处理文件上传ip问题
                        if ("file-upload".equals(oldField.get("type"))) {
                            options.put("uploadURL", String.format("http://%s:10076/common/upload", this.targetIp));
                        }
                    }
                    formJson.put(ProcessConstants.WIDGET_LIST, oldFields);
                    newP.put(ProcessConstants.TASK_FORM_KEY, formJson);
                    newP.remove(formDetailVO.getBeforeNodeDefId() + "&" + ProcessConstants.TASK_FORM_KEY);
                    // 处理已经上传的文件的ip地址
                    for (String s : newP.keySet()) {
                        if (ProcessConstants.TASK_FORM_KEY.equals(s)) {
                            continue;
                        }
                        if (s.startsWith("fileupload")) {
                            List files = (List) newP.get(s);
                            for (Object file : files) {
                                LinkedHashMap<String, String> fileMap = (LinkedHashMap<String, String>) file;
                                String url = fileMap.get("url");
                                fileMap.put("url", url.replace("42.193.1.25", this.targetIp));
                            }
                        }
                    }
                    formDetailVO.setFormJsonObj(newP);
                }
                // TODO 暂时只处理用户任务上的表单

 start/src/main/resources/application-dev.yml

@@ -114,3 +114,6 @@
#  app: # app的功能是为flowable在spring中高效运行而提供了很多bean，与flowable本身的内容无关
#    enabled: true
#  check-process-definitions: true

# 用于替换动态表单的文件上传ip（更换服务器ip没调整）
targetIp: 119.6.246.90

 start/src/main/resources/application-prod.yml

@@ -18,13 +18,14 @@
    # redis 配置
    redis:
        # 地址
        host: 42.193.1.25
#        host: 42.193.1.25
        host: 127.0.0.1
        # 端口，默认为6379
        port: 6379
        # 数据库索引
        database: 2
        # 密码
        password: ycl2018
#        password: ycl2018
        # 连接超时时间
        timeout: 10s
        lettuce:
@@ -43,7 +44,7 @@
        druid:
            # 主库数据源
            master:
                url: jdbc:mysql://221.237.224.33:8066/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                url: jdbc:mysql://119.6.246.90:8066/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                username: root
                password: Mysql@my
            # 从库数据源
@@ -119,3 +120,6 @@
#  app: # app的功能是为flowable在spring中高效运行而提供了很多bean，与flowable本身的内容无关
#    enabled: true
#  check-process-definitions: true

# 用于替换动态表单的文件上传ip（更换服务器ip没调整）
targetIp: 119.6.246.90