多模块重构 12：修改项目名字，按照新的规则

pom.xml

@@ -10,10 +10,10 @@
     <modules>
         <module>yudao-dependencies</module>
         <module>yudao-framework</module>
-
-        <module>yudao-admin-server</module>
+        <!-- Server 主项目 -->
+        <module>yudao-server</module>
 <!--        <module>yudao-user-server</module>-->
-
+        <!--  各种 module 拓展 -->
         <module>yudao-module-member</module>
         <module>yudao-module-bpm</module>
         <module>yudao-module-system</module>

yudao-admin-server/src/main/resources/processes/oa-leave.bpmn

@@ -1,177 +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: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" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.activiti.org/processdef">
-  <process id="leave-update" name="leave-update" isExecutable="true">
-    <startEvent id="start" name="开始" activiti:initiator="applyUserId" activiti:formKey="/flow/leave/apply" />
-    <exclusiveGateway id="sid-AA8342FE-0C98-4CDC-B90F-B09B1AFB8F18" name="请假天数" />
-    <sequenceFlow id="sid-8022586B-8169-44C2-84FA-46E8278EB2EC" sourceRef="start" targetRef="sid-AA8342FE-0C98-4CDC-B90F-B09B1AFB8F18" />
-    <userTask id="pmVerify" name="项目经理审批" activiti:assignee="${pm}" activiti:formKey="/flow/leave/approve"/>
-    <userTask id="bmVerify" name="部门经理审批" activiti:assignee="${bm}" activiti:formKey="/flow/leave/approve" />
-    <sequenceFlow id="sid-DE7C5477-8C20-42C5-ADE5-AB4A9A13D58D" name="大于3天" sourceRef="sid-AA8342FE-0C98-4CDC-B90F-B09B1AFB8F18" targetRef="bmVerify">
-      <conditionExpression xsi:type="tFormalExpression">${day&gt;3}</conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-B8A78811-23EE-47FA-9913-F04F056EBF99" name="小于等于3天" sourceRef="sid-AA8342FE-0C98-4CDC-B90F-B09B1AFB8F18" targetRef="pmVerify">
-      <conditionExpression xsi:type="tFormalExpression">${day&lt;=3}</conditionExpression>
-    </sequenceFlow>
-    <exclusiveGateway id="sid-57610114-27FA-4024-94BF-B0FFE4A02E90" name="" />
-    <exclusiveGateway id="sid-287EF265-9109-4233-AEF1-14DF6FEF4B24" name="" />
-    <userTask id="hrVerify" name="人事审批" activiti:assignee="${hr}" activiti:formKey="/flow/leave/approve"/>
-    <endEvent id="end" />
-    <sequenceFlow id="sid-3BDD734B-CF1F-4ECA-A234-92BB81132A1E" name="不同意" sourceRef="sid-57610114-27FA-4024-94BF-B0FFE4A02E90" targetRef="end">
-      <extensionElements>
-        <activiti:executionListener event="take"  delegateExpression="${leaveApplyEndProcessor}"></activiti:executionListener>
-      </extensionElements>
-      <conditionExpression xsi:type="tFormalExpression">${approved =='false'}</conditionExpression>
-    </sequenceFlow>
-    <exclusiveGateway id="sid-76B28F95-2D0C-4364-B898-AB1EC8182879" name="" />
-    <sequenceFlow id="sid-31C8FAA6-11F1-4744-99F6-D7DB98AB1B10" name="不同意" sourceRef="sid-76B28F95-2D0C-4364-B898-AB1EC8182879" targetRef="end">
-      <extensionElements>
-        <activiti:executionListener event="take"  delegateExpression="${leaveApplyEndProcessor}"></activiti:executionListener>
-      </extensionElements>
-      <conditionExpression xsi:type="tFormalExpression">${approved =='false'}</conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-63703246-F9C8-4C23-966B-DBC627A81C96" sourceRef="bmVerify" targetRef="sid-287EF265-9109-4233-AEF1-14DF6FEF4B24" />
-    <sequenceFlow id="sid-F94C3FB1-CD76-4ED1-BDEC-57B9FCA97E16" name="同意" sourceRef="sid-287EF265-9109-4233-AEF1-14DF6FEF4B24" targetRef="hrVerify">
-      <conditionExpression xsi:type="tFormalExpression">${approved =='true'}</conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-FA244B53-B5C2-41AB-85C6-CB2F40879779" name="同意" sourceRef="sid-57610114-27FA-4024-94BF-B0FFE4A02E90" targetRef="hrVerify">
-      <conditionExpression xsi:type="tFormalExpression">${approved =='true'}</conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-924D40AA-1A8E-4EC9-B73C-41D2A7DEFCCD" sourceRef="pmVerify" targetRef="sid-57610114-27FA-4024-94BF-B0FFE4A02E90" />
-    <sequenceFlow id="sid-ED1242F0-B0A6-4677-A02C-D0D06715DEBD" sourceRef="hrVerify" targetRef="sid-76B28F95-2D0C-4364-B898-AB1EC8182879" />
-    <sequenceFlow id="sid-B82F41EA-B147-4A19-AD93-A4EC3C40C92E" name="不同意" sourceRef="sid-287EF265-9109-4233-AEF1-14DF6FEF4B24" targetRef="end">
-      <extensionElements>
-        <activiti:executionListener event="take"  delegateExpression="${leaveApplyEndProcessor}"></activiti:executionListener>
-      </extensionElements>
-      <conditionExpression xsi:type="tFormalExpression">${approved =='false'}</conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-028073A9-C8C6-4B60-B0AC-6B61B79C17C4" name="同意" sourceRef="sid-76B28F95-2D0C-4364-B898-AB1EC8182879" targetRef="end">
-      <extensionElements>
-        <activiti:executionListener event="take"  delegateExpression="${leaveApplyEndProcessor}"></activiti:executionListener>
-      </extensionElements>
-      <conditionExpression xsi:type="tFormalExpression">${approved =='true'}</conditionExpression>
-    </sequenceFlow>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_leave-update">
-    <bpmndi:BPMNPlane id="BPMNPlane_leave-update" bpmnElement="leave-update">
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-8022586B-8169-44C2-84FA-46E8278EB2EC" bpmnElement="sid-8022586B-8169-44C2-84FA-46E8278EB2EC">
-        <omgdi:waypoint x="112.75714598551785" y="126.17405584019453" />
-        <omgdi:waypoint x="143.71121010641568" y="126.40818009529674" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-DE7C5477-8C20-42C5-ADE5-AB4A9A13D58D" bpmnElement="sid-DE7C5477-8C20-42C5-ADE5-AB4A9A13D58D">
-        <omgdi:waypoint x="163.86363505003538" y="106.56060503891644" />
-        <omgdi:waypoint x="163.86363505003538" y="53.13651552996619" />
-        <omgdi:waypoint x="234.27272508339232" y="53.13651552996619" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="159" y="77" width="40" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-B8A78811-23EE-47FA-9913-F04F056EBF99" bpmnElement="sid-B8A78811-23EE-47FA-9913-F04F056EBF99">
-        <omgdi:waypoint x="163.36363505003538" y="146.06060503891644" />
-        <omgdi:waypoint x="163.36363505003538" y="189.4949990648568" />
-        <omgdi:waypoint x="234.27272508339232" y="189.4949990648568" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="148" y="165" width="62" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-924D40AA-1A8E-4EC9-B73C-41D2A7DEFCCD" bpmnElement="sid-924D40AA-1A8E-4EC9-B73C-41D2A7DEFCCD">
-        <omgdi:waypoint x="331.23231804130836" y="189.49499906485684" />
-        <omgdi:waypoint x="385.7878751389872" y="189.49499906485684" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-63703246-F9C8-4C23-966B-DBC627A81C96" bpmnElement="sid-63703246-F9C8-4C23-966B-DBC627A81C96">
-        <omgdi:waypoint x="326.19171605111364" y="53.34371922706731" />
-        <omgdi:waypoint x="371.04578381953866" y="53.54593921607711" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-3BDD734B-CF1F-4ECA-A234-92BB81132A1E" bpmnElement="sid-3BDD734B-CF1F-4ECA-A234-92BB81132A1E">
-        <omgdi:waypoint x="425.32578782529805" y="189.957086378546" />
-        <omgdi:waypoint x="643.3636579939932" y="189.52287904122937" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="518" y="172" width="33" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-FA244B53-B5C2-41AB-85C6-CB2F40879779" bpmnElement="sid-FA244B53-B5C2-41AB-85C6-CB2F40879779">
-        <omgdi:waypoint x="410.4195073141635" y="174.12663124003316" />
-        <omgdi:waypoint x="446.39393516122516" y="123.49474452854777" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="417" y="131" width="23" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-F94C3FB1-CD76-4ED1-BDEC-57B9FCA97E16" bpmnElement="sid-F94C3FB1-CD76-4ED1-BDEC-57B9FCA97E16">
-        <omgdi:waypoint x="396.41667858914667" y="67.35619707424723" />
-        <omgdi:waypoint x="446.39393516122516" y="100.69330097746277" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="410" y="66" width="23" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-B82F41EA-B147-4A19-AD93-A4EC3C40C92E" bpmnElement="sid-B82F41EA-B147-4A19-AD93-A4EC3C40C92E">
-        <omgdi:waypoint x="410.23752422668827" y="53.53535143670566" />
-        <omgdi:waypoint x="704.9797941833938" y="53.53535143670566" />
-        <omgdi:waypoint x="704.9797941833938" y="190.5669944706311" />
-        <omgdi:waypoint x="671.3600836513306" y="189.81010495572275" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="703" y="119" width="33" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-ED1242F0-B0A6-4677-A02C-D0D06715DEBD" bpmnElement="sid-ED1242F0-B0A6-4677-A02C-D0D06715DEBD">
-        <omgdi:waypoint x="542.3536331797492" y="111.73247557218357" />
-        <omgdi:waypoint x="567.6060552057011" y="111.73247557218357" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-31C8FAA6-11F1-4744-99F6-D7DB98AB1B10" bpmnElement="sid-31C8FAA6-11F1-4744-99F6-D7DB98AB1B10">
-        <omgdi:waypoint x="589.3360756732812" y="130.00245510460337" />
-        <omgdi:waypoint x="646.8251334621888" y="180.27870448400202" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="602" y="137" width="33" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_sid-028073A9-C8C6-4B60-B0AC-6B61B79C17C4" bpmnElement="sid-028073A9-C8C6-4B60-B0AC-6B61B79C17C4">
-        <omgdi:waypoint x="607.1060552057011" y="112.23247557218357" />
-        <omgdi:waypoint x="657.3636302334985" y="112.23247557218357" />
-        <omgdi:waypoint x="657.3636302334985" y="175.49499906485684" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="621" y="94" width="23" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="BPMNShape_startEvent1" bpmnElement="start">
-        <omgdc:Bounds x="83" y="111" width="30" height="30" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="87" y="148" width="22" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-AA8342FE-0C98-4CDC-B90F-B09B1AFB8F18" bpmnElement="sid-AA8342FE-0C98-4CDC-B90F-B09B1AFB8F18" isMarkerVisible="true">
-        <omgdc:Bounds x="143" y="106" width="40" height="40" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="217" y="116" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-815754A6-1E86-43E5-8287-6D2A1DF59121" bpmnElement="pmVerify">
-        <omgdc:Bounds x="234" y="167" width="97" height="46" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-1E8B3F37-4DF8-459A-921C-74F2C210E3E2" bpmnElement="bmVerify">
-        <omgdc:Bounds x="234" y="30" width="92" height="46" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-57610114-27FA-4024-94BF-B0FFE4A02E90" bpmnElement="sid-57610114-27FA-4024-94BF-B0FFE4A02E90" isMarkerVisible="true">
-        <omgdc:Bounds x="386" y="169" width="40" height="40" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="384" y="216" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-287EF265-9109-4233-AEF1-14DF6FEF4B24" bpmnElement="sid-287EF265-9109-4233-AEF1-14DF6FEF4B24" isMarkerVisible="true">
-        <omgdc:Bounds x="371" y="33" width="40" height="40" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="369" y="80" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-A9CA50A0-1773-4341-B123-85FD1F360277" bpmnElement="hrVerify">
-        <omgdc:Bounds x="446" y="91" width="96" height="42" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-1B06331A-52FE-4D1B-A62B-80E71ABB7D0E" bpmnElement="end">
-        <omgdc:Bounds x="643" y="175" width="28" height="28" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_sid-76B28F95-2D0C-4364-B898-AB1EC8182879" bpmnElement="sid-76B28F95-2D0C-4364-B898-AB1EC8182879" isMarkerVisible="true">
-        <omgdc:Bounds x="568" y="92" width="40" height="40" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="566" y="139" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

yudao-admin-server/pom.xml → yudao-server/pom.xml

@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>yudao-admin-server</artifactId>
+    <artifactId>yudao-server</artifactId>
     <packaging>jar</packaging>
 
-    <name>yudao-admin-server</name>
+    <name>${artifactId}</name>
     <description>
         后端 Server 的主项目，通过引入需要 yudao-module-xxx 的依赖，
         从而实现提供 RESTful API 给 yudao-ui-admin、yudao-ui-user 等前端项目。

yudao-admin-server/src/main/java/cn/iocoder/yudao/server/AdminServerApplication.java → yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -5,10 +5,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
 @SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module"})
-public class AdminServerApplication {
+public class YudaoServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(AdminServerApplication.class, args);
+        SpringApplication.run(YudaoServerApplication.class, args);
     }
 
 }