github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jeecg-boot 1.0版本发布

pull/123/head
zhangdaihao 2019-02-25 16:51:16 +08:00
parent d6ba65a1bb
commit ef3171adf8
3 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot/src/main/java/org/jeecg/modules/shiro/authc/util/JwtUtil.java
View File

@ -18,7 +18,7 @@ import org.jeecg.common.util.oConvertUtils;
public class JwtUtil { public class JwtUtil {
// 过期时间30分钟 // 过期时间30分钟
public static final long EXPIRE_TIME = 1 * 60 * 1000; public static final long EXPIRE_TIME = 30 * 60 * 1000;
/** /**
* 校验token是否正确 * 校验token是否正确

40
jeecg-boot/src/main/resources/processes/MyProcess.bpmn
View File

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
<process id="myProcess" name="My process" isExecutable="true">
<endEvent id="endevent1" name="End"></endEvent>
<userTask id="zongtask" name="总经理审批" activiti:assignee="admin"></userTask>
<sequenceFlow id="flow2" sourceRef="zongtask" targetRef="endevent1"></sequenceFlow>
<userTask id="departtask" name="部门经理审批" activiti:assignee="scott"></userTask>
<startEvent id="startevent1" name="Start" activiti:initiator="applyUserId"></startEvent>
<sequenceFlow id="flow3" sourceRef="startevent1" targetRef="departtask"></sequenceFlow>
<sequenceFlow id="flow4" sourceRef="departtask" targetRef="zongtask"></sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_myProcess">
<bpmndi:BPMNPlane bpmnElement="myProcess" id="BPMNPlane_myProcess">
<bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
<omgdc:Bounds height="35.0" width="35.0" x="810.0" y="250.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="zongtask" id="BPMNShape_zongtask">
<omgdc:Bounds height="55.0" width="105.0" x="626.0" y="240.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="departtask" id="BPMNShape_departtask">
<omgdc:Bounds height="55.0" width="105.0" x="422.0" y="240.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
<omgdc:Bounds height="35.0" width="35.0" x="250.0" y="250.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
<omgdi:waypoint x="731.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="810.0" y="267.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
<omgdi:waypoint x="285.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="422.0" y="267.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
<omgdi:waypoint x="527.0" y="267.0"></omgdi:waypoint>
<omgdi:waypoint x="626.0" y="267.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>

28
jeecg-boot/src/test/java/org/jeecg/ActivitiTest.java
View File

@ -1,28 +0,0 @@
package org.jeecg;
import java.util.HashMap;
import java.util.Map;
import org.activiti.engine.RuntimeService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = JeecgApplication.class)
public class ActivitiTest {
@Autowired
RuntimeService runtimeService;
@Test
public void TestStartProcess() {
Map<String, Object> variables = new HashMap<>();
variables.put("applyUserId", "admin");
variables.put("email", "john.doe@activiti.com");
variables.put("phoneNumber", "123456789");
runtimeService.startProcessInstanceByKey("myProcess", variables);
}
}