Zhangtf пре 2 недеља
родитељ
комит
196823dd5f

+ 37 - 0
8c0c71014602432ea6a8226055e81b36xml.xml

@@ -0,0 +1,37 @@
+<?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:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.flowable.org/processdef">
+  <process id="process_udgzls7l" name="name_8o30ltep">
+    <startEvent id="startNode1" name="开始" />
+    <exclusiveGateway id="Gateway_08cg8io" />
+    <task id="Activity_16bevf1" />
+    <subProcess id="Activity_0mt1f01">
+      <startEvent id="Event_1ewn0p2" />
+    </subProcess>
+    <exclusiveGateway id="Gateway_15dg2rk" />
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_flow">
+    <bpmndi:BPMNPlane id="BPMNPlane_flow" bpmnElement="process_udgzls7l">
+      <bpmndi:BPMNShape id="BPMNShape_startNode1" bpmnElement="startNode1" bioc:stroke="">
+        <omgdc:Bounds x="240" y="200" width="30" height="30" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="242" y="237" width="23" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_08cg8io_di" bpmnElement="Gateway_08cg8io" isMarkerVisible="true">
+        <omgdc:Bounds x="45" y="25" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_16bevf1_di" bpmnElement="Activity_16bevf1">
+        <omgdc:Bounds x="205" y="50" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_15dg2rk_di" bpmnElement="Gateway_15dg2rk" isMarkerVisible="true">
+        <omgdc:Bounds x="-25" y="-165" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0mt1f01_di" bpmnElement="Activity_0mt1f01" isExpanded="true">
+        <omgdc:Bounds x="40" y="-110" width="350" height="200" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1ewn0p2_di" bpmnElement="Event_1ewn0p2">
+        <omgdc:Bounds x="80" y="-28" width="36" height="36" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

+ 6 - 0
node_modules/.package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "xtyc_yhhx",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

+ 2 - 0
xzl-admin/src/main/java/com/xzl/XzlApplication.java

@@ -1,5 +1,6 @@
 package com.xzl;
 
+import com.xzl.common.utils.SecurityUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -14,6 +15,7 @@ public class XzlApplication {
   public static void main(String[] args) {
     // System.setProperty("spring.devtools.restart.enabled", "false");
     SpringApplication.run(XzlApplication.class, args);
+    System.out.println(SecurityUtils.encryptPassword("123456"));
     System.out.println("系统启动成功 ...");
   }
 }

+ 10 - 8
xzl-admin/src/main/resources/application-dev.yml

@@ -6,10 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://webapplication.mysql.polardb.rds.aliyuncs.com:3306/xtdb_digital?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+                url: jdbc:mysql://localhost:3306/db_mcyc?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #                url: jdbc:mysql://webapplication.rwlb.rds.aliyuncs.com:3306/xtdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-                username: jerry
-                password: zjr38zjR@
+#                username: jerry
+ #               password: zjr38zjR@
+                username: root
+                password: 123456
 #                url: jdbc:mysql://localhost:3306/xtdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #                username: root
 #                password: 1234
@@ -17,9 +19,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -43,7 +45,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -66,4 +68,4 @@ spring:
 pythonFilePath: /usr/local/python/
 pythonPath: /usr/local/Cellar/python@3.10/3.10.11/bin/python3.10
 sqlFilePath: /usr/local/sql
-ERImagePath: /usr/local/ERImage
+ERImagePath: /usr/local/ERImage

+ 2 - 2
xzl-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 卷烟数字化营销
+VUE_APP_TITLE = 麻城烟草
 
 # 开发环境配置
 ENV = 'development'
 
-# 卷烟数字化营销/开发环境
+# 麻城烟草/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

+ 1 - 1
xzl-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 卷烟数字化营销
+VUE_APP_TITLE = 麻城烟草
 
 # 生产环境配置
 ENV = 'production'

+ 2 - 2
xzl-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 卷烟数字化营销
+VUE_APP_TITLE = 麻城烟草
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 卷烟数字化营销/测试环境
+# 麻城烟草/测试环境
 VUE_APP_BASE_API = '/stage-api'

Разлика између датотеке није приказан због своје велике величине
+ 5892 - 3
xzl-ui/package.json


+ 63 - 0
xzl-ui/src/views/flowableTest.vue

@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <bpmn-modeler
+      ref="refNode"
+      :xml="xml"
+      :users="users"
+      :groups="groups"
+      :categorys="categorys"
+      :is-view="false"
+      @save="save"
+    />
+  </div>
+</template>
+
+<script>
+import bpmnModeler from "workflow-bpmn-modeler";
+import axios from "axios";
+import request from "@/utils/request";
+
+export default {
+  components: {
+    bpmnModeler,
+  },
+  data() {
+    return {
+      xml: "", // 后端查询到的xml
+      users: [
+        { name: "javaboy", id: 1 },
+        { name: "itboyhub", id: 2 },
+        { name: "江南一点雨", id: 3 },
+      ],
+      groups: [
+        { name: "经理", id: 4 },
+        { name: "组长", id: 5 },
+        { name: "员工", id: 6 },
+      ],
+      categorys: [
+        { name: "OA", id: "oa" },
+        { name: "财务", id: "finance" },
+      ],
+    };
+  },
+  methods: {
+    getModelDetail() {
+      // 发送请求,获取xml
+      // this.xml = response.xml
+    },
+    save(data) {
+      console.log(data);  // { process: {...}, xml: '...', svg: '...' }
+      console.log(data.xml)
+      var formData = new FormData();
+      formData.append("text", data.xml);
+      request({
+        url: "/xml/save",
+        method: "post",
+        data: formData
+      }).then(rs => {
+       console.log("1111")
+      })
+    },
+  },
+};
+</script>

+ 1 - 1
xzl-ui/src/views/login.vue

@@ -2,7 +2,7 @@
   <div class="login" style="">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
 <!--      <img id="switch" class="switch" ref="switch" :src="getImg()" @click="switchLogin()"  style="cursor: pointer;width: 60px;height: 60px;position: absolute;right: 0;top: 0;">-->
-      <h3 class="title">卷烟数字化营销</h3>
+      <h3 class="title">麻城烟草</h3>
       <div id="passLogin" v-if="isPassLogin">
         <el-form-item prop="username">
           <el-input

+ 1 - 1
xzl-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8084`,
+        target: `http://localhost:8086`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

+ 197 - 0
流程图.xml

@@ -0,0 +1,197 @@
+<?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:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.flowable.org/processdef">
+  <process id="process_fivbraoc" name="name_acpxco9c">
+    <startEvent id="startNode1" name="开始">
+      <outgoing>Flow_0946yw1</outgoing>
+    </startEvent>
+    <task id="Activity_0ckkq1f" name="计划项目">
+      <incoming>Flow_0946yw1</incoming>
+      <outgoing>Flow_00vlfpd</outgoing>
+    </task>
+    <sequenceFlow id="Flow_0946yw1" sourceRef="startNode1" targetRef="Activity_0ckkq1f" />
+    <task id="Activity_15bm59o" name="实施审批">
+      <incoming>Flow_00vlfpd</incoming>
+      <outgoing>Flow_08yk91x</outgoing>
+    </task>
+    <sequenceFlow id="Flow_00vlfpd" sourceRef="Activity_0ckkq1f" targetRef="Activity_15bm59o" />
+    <task id="Activity_0bpon7o" name="谈判文件审批">
+      <incoming>Flow_08yk91x</incoming>
+      <outgoing>Flow_06ekjix</outgoing>
+    </task>
+    <sequenceFlow id="Flow_08yk91x" sourceRef="Activity_15bm59o" targetRef="Activity_0bpon7o" />
+    <task id="Activity_1tx6f21" name="成立采购小组">
+      <incoming>Flow_06ekjix</incoming>
+      <outgoing>Flow_1qjoo9r</outgoing>
+    </task>
+    <task id="Activity_15g5irk" name="采购结果确认">
+      <incoming>Flow_1qjoo9r</incoming>
+      <outgoing>Flow_05u9j8w</outgoing>
+    </task>
+    <sequenceFlow id="Flow_1qjoo9r" sourceRef="Activity_1tx6f21" targetRef="Activity_15g5irk" />
+    <task id="Activity_0ox404g" name="成交通知">
+      <incoming>Flow_05u9j8w</incoming>
+      <outgoing>Flow_1y7wq4h</outgoing>
+    </task>
+    <exclusiveGateway id="Gateway_052hix5">
+      <incoming>Flow_1y7wq4h</incoming>
+      <outgoing>Flow_113wiy1</outgoing>
+      <outgoing>Flow_002jdh5</outgoing>
+    </exclusiveGateway>
+    <task id="Activity_0xxk6tl" name="合同签订">
+      <incoming>Flow_002jdh5</incoming>
+      <outgoing>Flow_1lop8md</outgoing>
+    </task>
+    <task id="Activity_0rvzrww" name="合同变更">
+      <incoming>Flow_113wiy1</incoming>
+      <outgoing>Flow_1hnstun</outgoing>
+    </task>
+    <task id="Activity_052rsx6" name="评价">
+      <incoming>Flow_02kez4v</incoming>
+      <outgoing>Flow_0kogvrf</outgoing>
+    </task>
+    <task id="Activity_10scisc" name="支付">
+      <incoming>Flow_0kogvrf</incoming>
+      <outgoing>Flow_0zqo0a4</outgoing>
+    </task>
+    <task id="Activity_0cn6mn7" name="归档">
+      <incoming>Flow_0zqo0a4</incoming>
+      <outgoing>Flow_1rs37fq</outgoing>
+    </task>
+    <sequenceFlow id="Flow_06ekjix" sourceRef="Activity_0bpon7o" targetRef="Activity_1tx6f21" />
+    <endEvent id="Event_0ikhcye" name="结束">
+      <incoming>Flow_1rs37fq</incoming>
+    </endEvent>
+    <sequenceFlow id="Flow_1rs37fq" sourceRef="Activity_0cn6mn7" targetRef="Event_0ikhcye" />
+    <sequenceFlow id="Flow_1y7wq4h" sourceRef="Activity_0ox404g" targetRef="Gateway_052hix5" />
+    <sequenceFlow id="Flow_05u9j8w" sourceRef="Activity_15g5irk" targetRef="Activity_0ox404g" />
+    <sequenceFlow id="Flow_113wiy1" sourceRef="Gateway_052hix5" targetRef="Activity_0rvzrww" />
+    <sequenceFlow id="Flow_0kogvrf" sourceRef="Activity_052rsx6" targetRef="Activity_10scisc" />
+    <task id="Activity_1ijd0vv" name="验收">
+      <incoming>Flow_1hnstun</incoming>
+      <incoming>Flow_1lop8md</incoming>
+      <outgoing>Flow_02kez4v</outgoing>
+    </task>
+    <sequenceFlow id="Flow_02kez4v" sourceRef="Activity_1ijd0vv" targetRef="Activity_052rsx6" />
+    <sequenceFlow id="Flow_1hnstun" sourceRef="Activity_0rvzrww" targetRef="Activity_1ijd0vv" />
+    <sequenceFlow id="Flow_002jdh5" sourceRef="Gateway_052hix5" targetRef="Activity_0xxk6tl" />
+    <sequenceFlow id="Flow_1lop8md" sourceRef="Activity_0xxk6tl" targetRef="Activity_1ijd0vv" />
+    <sequenceFlow id="Flow_0zqo0a4" sourceRef="Activity_10scisc" targetRef="Activity_0cn6mn7" />
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_flow">
+    <bpmndi:BPMNPlane id="BPMNPlane_flow" bpmnElement="process_fivbraoc">
+      <bpmndi:BPMNEdge id="Flow_0946yw1_di" bpmnElement="Flow_0946yw1">
+        <di:waypoint x="375" y="-90" />
+        <di:waypoint x="400" y="-90" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_00vlfpd_di" bpmnElement="Flow_00vlfpd">
+        <di:waypoint x="500" y="-90" />
+        <di:waypoint x="550" y="-90" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_08yk91x_di" bpmnElement="Flow_08yk91x">
+        <di:waypoint x="650" y="-90" />
+        <di:waypoint x="700" y="-90" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1qjoo9r_di" bpmnElement="Flow_1qjoo9r">
+        <di:waypoint x="900" y="-50" />
+        <di:waypoint x="900" y="-10" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_06ekjix_di" bpmnElement="Flow_06ekjix">
+        <di:waypoint x="800" y="-90" />
+        <di:waypoint x="850" y="-90" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1rs37fq_di" bpmnElement="Flow_1rs37fq">
+        <di:waypoint x="740" y="660" />
+        <di:waypoint x="740" y="682" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1y7wq4h_di" bpmnElement="Flow_1y7wq4h">
+        <di:waypoint x="750" y="70" />
+        <di:waypoint x="750" y="105" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_05u9j8w_di" bpmnElement="Flow_05u9j8w">
+        <di:waypoint x="850" y="30" />
+        <di:waypoint x="800" y="30" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_113wiy1_di" bpmnElement="Flow_113wiy1">
+        <di:waypoint x="725" y="130" />
+        <di:waypoint x="650" y="130" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0kogvrf_di" bpmnElement="Flow_0kogvrf">
+        <di:waypoint x="740" y="430" />
+        <di:waypoint x="740" y="460" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1hnstun_di" bpmnElement="Flow_1hnstun">
+        <di:waypoint x="600" y="170" />
+        <di:waypoint x="600" y="270" />
+        <di:waypoint x="690" y="270" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_02kez4v_di" bpmnElement="Flow_02kez4v">
+        <di:waypoint x="740" y="310" />
+        <di:waypoint x="740" y="350" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_002jdh5_di" bpmnElement="Flow_002jdh5">
+        <di:waypoint x="775" y="130" />
+        <di:waypoint x="850" y="130" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1lop8md_di" bpmnElement="Flow_1lop8md">
+        <di:waypoint x="890" y="170" />
+        <di:waypoint x="890" y="270" />
+        <di:waypoint x="790" y="270" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0zqo0a4_di" bpmnElement="Flow_0zqo0a4">
+        <di:waypoint x="740" y="540" />
+        <di:waypoint x="740" y="580" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Activity_0bpon7o_di" bpmnElement="Activity_0bpon7o">
+        <omgdc:Bounds x="700" y="-130" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1tx6f21_di" bpmnElement="Activity_1tx6f21">
+        <omgdc:Bounds x="850" y="-130" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_15g5irk_di" bpmnElement="Activity_15g5irk">
+        <omgdc:Bounds x="850" y="-10" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_15bm59o_di" bpmnElement="Activity_15bm59o">
+        <omgdc:Bounds x="550" y="-130" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ckkq1f_di" bpmnElement="Activity_0ckkq1f">
+        <omgdc:Bounds x="400" y="-130" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_startNode1" bpmnElement="startNode1" bioc:stroke="">
+        <omgdc:Bounds x="345" y="-105" width="30" height="30" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="347" y="-68" width="23" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ox404g_di" bpmnElement="Activity_0ox404g">
+        <omgdc:Bounds x="700" y="-10" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_052hix5_di" bpmnElement="Gateway_052hix5" isMarkerVisible="true">
+        <omgdc:Bounds x="725" y="105" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0rvzrww_di" bpmnElement="Activity_0rvzrww">
+        <omgdc:Bounds x="550" y="90" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1ijd0vv_di" bpmnElement="Activity_1ijd0vv">
+        <omgdc:Bounds x="690" y="230" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0xxk6tl_di" bpmnElement="Activity_0xxk6tl">
+        <omgdc:Bounds x="850" y="90" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_052rsx6_di" bpmnElement="Activity_052rsx6">
+        <omgdc:Bounds x="690" y="350" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_10scisc_di" bpmnElement="Activity_10scisc">
+        <omgdc:Bounds x="690" y="460" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0ikhcye_di" bpmnElement="Event_0ikhcye">
+        <omgdc:Bounds x="722" y="682" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="729" y="725" width="23" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0cn6mn7_di" bpmnElement="Activity_0cn6mn7">
+        <omgdc:Bounds x="690" y="580" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>