试用期时间修改

zhongrj

2023-09-19 8c2ceeb43b119c01a22482af7899fba10b5cf811

试用期时间修改

 src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java

@@ -117,7 +117,7 @@
        UserInfo userInfo = granter.grant(tokenParameter);

        try {
            Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-20").getTime();
            Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-26").getTime();
            long now= System.currentTimeMillis();
            if (parse < now){
                throw new ServiceException("试用已到期");

 src/main/resources/processes/ExamCheckProcess.bpmn20.xml

New file
@@ -0,0 +1,82 @@
<?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:flowable="http://flowable.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.flowable.org/processdef">
  <process id="exam_check" name="考试审批" isExecutable="true">
    <documentation>考试申请审批</documentation>
    <startEvent id="startEvent1" name="开始"></startEvent>
    <userTask id="sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603" name="县级审批" flowable:candidateGroups="countyManager"></userTask>
    <userTask id="sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450" name="调整申请" flowable:assignee="${taskUser}">
      <extensionElements>
        <modeler:initiator-can-complete xmlns:modeler="http://flowable.org/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
      </extensionElements>
    </userTask>
    <userTask id="sid-63917B27-3F58-4962-8B19-9C6D6543ED89" name="市级审批" flowable:candidateGroups="cityManager"></userTask>
    <endEvent id="sid-70A3968A-C3DE-469C-8DCC-E2251159563C" name="结束"></endEvent>
    <sequenceFlow id="sid-D8FC8700-C5C5-4940-A678-F9198ABEC4C6" sourceRef="startEvent1" targetRef="sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603"></sequenceFlow>
    <sequenceFlow id="sid-E1EC370A-ED8C-4E25-AC33-DFED2231F8E0" name="驳回" sourceRef="sid-63917B27-3F58-4962-8B19-9C6D6543ED89" targetRef="sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450">
      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
    </sequenceFlow>
    <sequenceFlow id="sid-E5BC3E43-81ED-473A-B29C-2620BA1E7629" name="驳回" sourceRef="sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603" targetRef="sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450">
      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
    </sequenceFlow>
    <sequenceFlow id="sid-E648FA77-3AFD-48D8-BB5E-35D65C804491" name="重新申请" sourceRef="sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450" targetRef="sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603">
      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
    </sequenceFlow>
    <sequenceFlow id="sid-518A246C-3ACA-4CD3-B14E-8C770ED17896" name="取消申请" sourceRef="sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450" targetRef="sid-70A3968A-C3DE-469C-8DCC-E2251159563C">
      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!pass}]]></conditionExpression>
    </sequenceFlow>
    <sequenceFlow id="sid-48C715FA-8333-4C5B-BFD8-A7FD26278B42" name="通过" sourceRef="sid-63917B27-3F58-4962-8B19-9C6D6543ED89" targetRef="sid-70A3968A-C3DE-469C-8DCC-E2251159563C">
      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
    </sequenceFlow>
    <sequenceFlow id="sid-3B5344E8-C5A4-4528-B106-F31B368DAD02" name="通过" sourceRef="sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603" targetRef="sid-63917B27-3F58-4962-8B19-9C6D6543ED89">
      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass}]]></conditionExpression>
    </sequenceFlow>
  </process>
  <bpmndi:BPMNDiagram id="BPMNDiagram_exam_check">
    <bpmndi:BPMNPlane bpmnElement="exam_check" id="BPMNPlane_exam_check">
      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
        <omgdc:Bounds height="30.0" width="30.0" x="45.0" y="163.0"></omgdc:Bounds>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603" id="BPMNShape_sid-B4EEB0CA-ED37-4CEE-91CC-C54311DA2603">
        <omgdc:Bounds height="80.0" width="100.0" x="175.0" y="138.0"></omgdc:Bounds>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450" id="BPMNShape_sid-9D129C6D-6B8B-45DF-8F4B-B3504CCAB450">
        <omgdc:Bounds height="80.0" width="100.0" x="435.0" y="360.0"></omgdc:Bounds>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="sid-63917B27-3F58-4962-8B19-9C6D6543ED89" id="BPMNShape_sid-63917B27-3F58-4962-8B19-9C6D6543ED89">
        <omgdc:Bounds height="80.0" width="100.0" x="435.0" y="138.0"></omgdc:Bounds>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="sid-70A3968A-C3DE-469C-8DCC-E2251159563C" id="BPMNShape_sid-70A3968A-C3DE-469C-8DCC-E2251159563C">
        <omgdc:Bounds height="28.0" width="28.0" x="690.0" y="164.0"></omgdc:Bounds>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNEdge bpmnElement="sid-518A246C-3ACA-4CD3-B14E-8C770ED17896" id="BPMNEdge_sid-518A246C-3ACA-4CD3-B14E-8C770ED17896">
        <omgdi:waypoint x="524.4101351351351" y="360.0"></omgdi:waypoint>
        <omgdi:waypoint x="694.1680746056907" y="187.93101427071826"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="sid-D8FC8700-C5C5-4940-A678-F9198ABEC4C6" id="BPMNEdge_sid-D8FC8700-C5C5-4940-A678-F9198ABEC4C6">
        <omgdi:waypoint x="74.94999932866257" y="178.0"></omgdi:waypoint>
        <omgdi:waypoint x="174.99999999998465" y="178.0"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="sid-3B5344E8-C5A4-4528-B106-F31B368DAD02" id="BPMNEdge_sid-3B5344E8-C5A4-4528-B106-F31B368DAD02">
        <omgdi:waypoint x="274.9499999998907" y="178.0"></omgdi:waypoint>
        <omgdi:waypoint x="434.999999999883" y="178.0"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="sid-E5BC3E43-81ED-473A-B29C-2620BA1E7629" id="BPMNEdge_sid-E5BC3E43-81ED-473A-B29C-2620BA1E7629">
        <omgdi:waypoint x="225.0" y="217.95000000000002"></omgdi:waypoint>
        <omgdi:waypoint x="225.0" y="400.0"></omgdi:waypoint>
        <omgdi:waypoint x="434.999999999926" y="400.0"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="sid-48C715FA-8333-4C5B-BFD8-A7FD26278B42" id="BPMNEdge_sid-48C715FA-8333-4C5B-BFD8-A7FD26278B42">
        <omgdi:waypoint x="534.9499999999925" y="178.0"></omgdi:waypoint>
        <omgdi:waypoint x="690.0" y="178.0"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="sid-E1EC370A-ED8C-4E25-AC33-DFED2231F8E0" id="BPMNEdge_sid-E1EC370A-ED8C-4E25-AC33-DFED2231F8E0">
        <omgdi:waypoint x="485.0" y="217.95000000000002"></omgdi:waypoint>
        <omgdi:waypoint x="485.0" y="360.0"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="sid-E648FA77-3AFD-48D8-BB5E-35D65C804491" id="BPMNEdge_sid-E648FA77-3AFD-48D8-BB5E-35D65C804491">
        <omgdi:waypoint x="438.15161072313583" y="360.0"></omgdi:waypoint>
        <omgdi:waypoint x="271.781268303672" y="217.95000000000002"></omgdi:waypoint>
      </bpmndi:BPMNEdge>
    </bpmndi:BPMNPlane>
  </bpmndi:BPMNDiagram>
</definitions>