@IPU_REQ_2022@保存Model到nacos;从nacos拉取Model和服务流配置到本地，并注册到服务流引擎中。

qb-auth-server/src/main/java/com/ipu/logicflow/server/LogicflowServerStart.java

@@ -25,9 +25,10 @@ public class LogicflowServerStart {
        registerExceptionCode();
        // 启动服务
        IpuRestApplication.start(args);
        //注册nacos监听
        //注册nacos配置中心的监听
        registerNacosListener();
        //从nacos配置中心拉取已有配置到本地
        pullConfigFromNacos();
    }
    private static void registerExceptionCode(){
@@ -39,11 +40,29 @@ public class LogicflowServerStart {
    private static void registerNacosListener(){
    	try {
    		INacosService service = SpringBeanUtil.getBean(INacosService.class);
			service.addListener(LogicFlowConfig.FLOW_LOGIC,"DEFAULT_GROUP",new FlowLogicListener());
			//服务逻辑流配置的监听
    		service.addListener(LogicFlowConfig.FLOW_LOGIC,"DEFAULT_GROUP",new FlowLogicListener());
    		//Model配置的监听
			service.addListener(LogicFlowConfig.FLOW_MODEL,"DEFAULT_GROUP",new FlowModelListener());
		} catch (Exception e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
    }
    
    private static void pullConfigFromNacos(){
    	try {
    		INacosService service = SpringBeanUtil.getBean(INacosService.class);
			//拉取服务逻辑流配置
    		String flowConfig = service.pullFromServer(LogicFlowConfig.FLOW_LOGIC,"DEFAULT_GROUP",0);
    		LogicFlowConfig.registerLogicFlow(flowConfig);
    		
    		//拉取Model配置
    		String modelConfig = service.pullFromServer(LogicFlowConfig.FLOW_MODEL,"DEFAULT_GROUP",0);
			LogicFlowConfig.registerLogicModel(modelConfig);
		} catch (Exception e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
    }
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/control/LogicController.java

@@ -62,5 +62,13 @@ public class LogicController {
        logicService.saveFlowToConfigCenter(flowName, flowXml);
        return "ok";
    }
    
    @ResponseBody
    @RequestMapping("/saveModelToConfigCenter/{modelName}")
    public Object saveModelToConfigCenter(@PathVariable("modelName") String modelName,@RequestBody String modelXml) throws Exception {
        System.out.println("input="+modelXml);    
        logicService.saveModelToConfigCenter(modelName, modelXml);
        return "ok";
    }
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/control/LogicQueryController.java

@@ -17,7 +17,7 @@ public class LogicQueryController {
	
	@ResponseBody
    @RequestMapping("/getFlow")
    public Object getFlow(@RequestBody String flowName) throws Exception {
    public Object getFlow(@RequestBody(required=false) String flowName) throws Exception {
        System.out.println("input="+flowName);    
        Object result = queryService.getFlowMap(flowName);
        return result;
@@ -25,7 +25,7 @@ public class LogicQueryController {
	
	@ResponseBody
    @RequestMapping("/getModel")
    public Object getModel(@RequestBody String ModelName) throws Exception {
    public Object getModel(@RequestBody(required=false) String ModelName) throws Exception {
        System.out.println("input="+ModelName);    
        Object result = queryService.getModelMap(ModelName);
        return result;

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/listener/FlowLogicListener.java

@@ -3,10 +3,7 @@ package com.ipu.logicflow.server.biz.logic.listener;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.basic.string.StringUtil;
import com.ai.ipu.restful.spring.SpringBeanUtil;
import com.alibaba.nacos.api.config.listener.AbstractListener;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
import com.ipu.logicflow.server.util.LogicFlowConfig;
public class FlowLogicListener extends AbstractListener {
@@ -16,19 +13,7 @@ public class FlowLogicListener extends AbstractListener {
	public void receiveConfigInfo(String configInfo) {
		try {
			LOG.debug(">>>>>>>>>>>>>>>>>>>new config from nacos:" + configInfo);
			if (!StringUtil.isEmpty(configInfo)) {
				String[] configs = configInfo.split("\n");
				int i=0;
				for (;i<configs.length;i++) {
					String[] config = configs[i].split("==");
					if (!LogicFlowConfig.getFlowPathMap().containsKey(config[0]))
					{
						LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
						logicService.registerFlow(config[1]);
						LOG.debug("添加Flow配置成功：" + config[1]);
					}
				}	
			}
			LogicFlowConfig.registerLogicFlow(configInfo);
		} catch (Exception e) {
			e.printStackTrace();
			LOG.error("receiveConfigInfo error:", e);

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/listener/FlowModelListener.java

@@ -4,9 +4,8 @@ package com.ipu.logicflow.server.biz.logic.listener;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.restful.spring.SpringBeanUtil;
import com.alibaba.nacos.api.config.listener.AbstractListener;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
import com.ipu.logicflow.server.util.LogicFlowConfig;
public class FlowModelListener extends AbstractListener {
	private static final ILogger LOG = IpuLoggerFactory.createLogger(FlowModelListener.class);
@@ -15,9 +14,7 @@ public class FlowModelListener extends AbstractListener {
	public void receiveConfigInfo(String configInfo) {
		try {
			LOG.debug(">>>>>>>>>>>>>>>>>>>new config from nacos:" + configInfo);
			LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
			logicService.registerModel(configInfo);
			LOG.debug("添加Model配置成功");
			LogicFlowConfig.registerLogicModel(configInfo);
		} catch (Exception e) {
			LOG.error("receiveConfigInfo error:", e);

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/service/impl/LogicServiceImpl.java

@@ -117,6 +117,6 @@ public class LogicServiceImpl implements LogicService {
		if (!StringUtil.isEmpty(strConfigInfo))
		    newConfigInfo.append(strConfigInfo).append("\n");
		newConfigInfo.append(modelName).append("==").append(LogicFlowConfig.replaceBlank(modelXml));
		service.pushConfigToServer(LogicFlowConfig.FLOW_LOGIC, "DEFAULT_GROUP", newConfigInfo.toString());
		service.pushConfigToServer(LogicFlowConfig.FLOW_MODEL, "DEFAULT_GROUP", newConfigInfo.toString());
	}
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/util/LogicFlowConfig.java

@@ -1,5 +1,10 @@
package com.ipu.logicflow.server.util;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.basic.string.StringUtil;
import com.ai.ipu.restful.spring.SpringBeanUtil;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
import com.nuosi.flow.util.LogicFlowUtil;
import java.util.HashMap;
@@ -20,6 +25,7 @@ import java.util.regex.Pattern;
 * @version v1.0.0
 */
public class LogicFlowConfig {
	private static final ILogger LOG = IpuLoggerFactory.createLogger(LogicFlowConfig.class);
	public static final String FLOW_LOGIC = "flowLogic.xml";
	public static final String FLOW_MODEL = "flowModel.xml";
@@ -34,6 +40,7 @@ public class LogicFlowConfig {
	public static void initModel() {
		modelPathMap.put("sec_user", "flow/user/model/sec_user.xml");
		modelPathMap.put("sec_organize", "flow/org/model/sec_organize.xml");
		//modelPathMap.put("sec_org_user_rel", "flow/org/model/sec_org_user_rel.xml");
		Iterator<String> it = modelPathMap.values().iterator();
		while (it.hasNext()) {
			LogicFlowUtil.loadLogicModel(it.next());
@@ -78,4 +85,36 @@ public class LogicFlowConfig {
		}
		return dest;
	}
	
	public static void registerLogicFlow(String flowConfig) throws Exception {
		if (!StringUtil.isEmpty(flowConfig)) {
			String[] configs = flowConfig.split("\n");
			int i=0;
			for (;i<configs.length;i++) {
				String[] config = configs[i].split("==");
				if (!LogicFlowConfig.getFlowPathMap().containsKey(config[0]))
				{
					LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
					logicService.registerFlow(config[1]);
					LOG.debug("添加Flow配置成功：" + config[1]);
				}
			}	
		}
	}
	
	public static void registerLogicModel(String modelConfig) throws Exception {
		if (!StringUtil.isEmpty(modelConfig)) {
			String[] configs = modelConfig.split("\n");
			int i=0;
			for (;i<configs.length;i++) {
				String[] config = configs[i].split("==");
				if (!LogicFlowConfig.getFlowPathMap().containsKey(config[0]))
				{
					LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
					logicService.registerModel(config[1]);
					LOG.debug("添加Model配置成功：" + config[1]);
				}
			}	
		}
	}
}

qb-auth-server/src/main/resources/flow/org/model/sec_org_user_rel.xml

@@ -3,20 +3,20 @@
    <attr id="org_user_rel_id" type="int" name="角色关联用户标识"/>
    <attr id="user_id" type="int" name="用户标识"/>
    <attr id="organize_id" type="int" name="角色标识"/>
    <attr id="valid_date" type="datetime" name="生效日期"/>
    <attr id="expire_date" type="datetime" name="失效日期"/>
    <attr id="valid_date" type="datetime" name="生效日期" exists="false"/>
    <attr id="expire_date" type="datetime" name="失效日期" exists="false"/>
    <attr id="data_status" type="string" name="数据状态"/>
    <attr id="create_date" type="datetime" name="创建日期"/>
    <attr id="create_op_id" type="string" name="创建人员"/>
    <attr id="create_org_id" type="string" name="创建组织"/>
    <attr id="done_code" type="datetime" name="事务编号"/>
    <attr id="done_date" type="datetime" name="操作日期"/>
    <attr id="create_op_id" type="string" name="创建人员" exists="false"/>
    <attr id="create_org_id" type="string" name="创建组织" exists="false"/>
    <attr id="done_code" type="datetime" name="事务编号" exists="false"/>
    <attr id="done_date" type="datetime" name="操作日期" exists="false"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="org_id" type="string" name="操作组织"/>
    <attr id="mgmt_district" type="string" name="管理地区"/>
    <attr id="mgmt_county" type="string" name="管理国家"/>
    <attr id="region_id" type="string" name="区域ID"/>
    <attr id="tenant_code" type="string" name="租户编码"/>
    <attr id="org_id" type="string" name="操作组织" exists="false" />
    <attr id="mgmt_district" type="string" name="管理地区" exists="false"/>
    <attr id="mgmt_county" type="string" name="管理国家" exists="false"/>
    <attr id="region_id" type="string" name="区域ID" exists="false"/>
    <attr id="tenant_code" type="string" name="租户编码" exists="false"/>
    <behavior id="insertOrgUserRel" name="新增用户组织信息">
        <function domain="DB" name="insert">

qb-auth-server/src/main/resources/flow/org/org_user_rel_delete.xml

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_delete"
            name="删除组织下人员信息"
            desc="删除组织下人员信息">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="deletetOrgUserRel">
        <var key="org_user_rel_cond" model="sec_org_user_rel" attrExists="false"/>
    </start>
    <action id="deletetOrgUserRel" name="删除组织下人员信息" next="end">
        <input>
            <var key="org_user_rel_cond" model="sec_org_user_rel"/>
        </input>
        <behavior model="sec_org_user_rel" id="deleteOrgUserRel"/>
        <output>
            <var key="result"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="result"/>
    </end>
</logic-flow>

qb-auth-server/src/main/resources/flow/org/org_user_rel_delete_by_cond.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_delete"
<logic-flow id="org_user_rel_delete_by_cond"
            name="删除组织下人员信息"
            desc="删除组织下人员信息">
    <declare>
@@ -7,12 +7,12 @@
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="deletetOrgUserRel">
    <start id="start" name="开始节点" next="deleteOrgUserRelByUserId">
        <var key="user_id" model="sec_org_user_rel" attr="user_id"/>
            <var key="organize_id" model="sec_org_user_rel" attr="organize_id"/>
    </start>
    <action id="deletetOrgUserRel" name="删除组织下人员信息" next="end">
    <action id="deleteOrgUserRelByUserId" name="删除组织下人员信息" next="end">
        <input>
            <var key="user_id" model="sec_org_user_rel" attr="user_id"/>
            <var key="organize_id" model="sec_org_user_rel" attr="organize_id"/>

qb-auth-server/src/test/java/com/ipu/logicflow/server/OrgUserRelTest.java

@@ -78,6 +78,25 @@ public class OrgUserRelTest {
        JMap result = null;
        try {
            
            result = LogicFlowEngine.execute("org_user_rel_delete_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        } catch (Exception e) {
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testDeleteOrgUserRel(){
    	String org_user_rel_id = "2";
        JSONObject org_user_rel_cond = new JSONObject();
        org_user_rel_cond.put("org_user_rel_id", org_user_rel_id);
        JMap param = new JsonMap();
        param.put("org_user_rel_cond", org_user_rel_cond);
        JMap result = null;
        try {
            
            result = LogicFlowEngine.execute("org_user_rel_delete", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
@@ -86,6 +105,7 @@ public class OrgUserRelTest {
            Assert.assertTrue(false);
        }
    }
    
    @Before
    public void before() throws IOException {
        String[] models = {
@@ -97,6 +117,7 @@ public class OrgUserRelTest {
        String[] flows = {
                "flow/org/org_user_rel_insert.xml",
                "flow/org/org_user_rel_delete.xml",
                "flow/org/org_user_rel_delete_by_cond.xml",
                "flow/org/org_user_rel_select.xml",
                "flow/org/org_user_rel_select_by_cond.xml",