소스 검색

冲突解决

zhenglingfeng 8 년 전
부모
커밋
cf154cd739
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      src/main/resources/resource/SystemServiceFlowProcess.hbm.xml
  2. 1 1
      src/main/webapp/develop/lib/gooflow/js/GooFlow.js

+ 3 - 3
src/main/resources/resource/SystemServiceFlowProcess.hbm.xml

@ -24,9 +24,9 @@
                <comment>模板编辑结果</comment>
            </column>
        </property>
        <property name="fileName" type="java.lang.String">
            <column name="file_name">
                <comment>生成文件存储名称</comment>
        <property name="flowId" type="java.lang.Integer">
            <column name="flow_id" length="11">
                <comment>流程ID</comment>
            </column>
        </property>
    </class>

+ 1 - 1
src/main/webapp/develop/lib/gooflow/js/GooFlow.js

@ -99,7 +99,7 @@ function GooFlow(bgDiv, property) {
	var that = this;
	// *************************************************** 【请求地址】
	var URL = "http://192.168.131.110:8080",
	var URL = "http://localhost:8080",
		getAllEndpointsURL = URL + "/esb/process/getAllEndpoints",
		getAllProcessorsURL = URL + "/esb/process/getAllProcessors";