lining 6 лет назад
Родитель
Сommit
a54fdcf32c

+ 9 - 7
src/main/resources/config/application-dev.yml

@@ -37,10 +37,12 @@ spring:
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
         # url: jdbc:mysql://60.30.245.229:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        url: jdbc:mysql://47.92.212.59:3306/activiti-supplier?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        # url: jdbc:mysql://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        username: root
-        password: zks123456
+        # url: jdbc:mysql://47.92.212.59:3306/activiti-supplier?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        url: jdbc:mysql://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        username: dqmnt_user
+        password: Y6Ba64w1Hezo
+        # username: root
+        # password: zks123456
         hikari:
             auto-commit: false
             data-source-properties:
@@ -61,7 +63,7 @@ spring:
             hibernate.cache.region.factory_class: io.github.jhipster.config.jcache.BeanClassLoaderAwareJCacheRegionFactory
     liquibase:
         contexts: dev
-        enabled: false
+        enabled: true
     mail:
         host: localhost
         port: 25
@@ -76,8 +78,8 @@ spring:
         jobExecutorActivate: false
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
-        database-schema-update: false
-        check-process-definitions: false
+        database-schema-update: true
+        check-process-definitions: true
         process-definition-location-prefix: classpath:/processes2/
     #    process-definition-location-suffixes:
     #      - **.bpmn

+ 6 - 4
src/main/resources/config/application-prod.yml

@@ -27,9 +27,11 @@ spring:
             enabled: false
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
-        url: jdbc:mysql://47.92.212.59:3306/activiti-supplier?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        url: jdbc:mysql://47.92.212.59:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         # url: jdbc:mysql://172.17.0.1:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         # url: jdbc:mysql://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        # username: dqmnt_user
+        # password: Y6Ba64w1Hezo
         username: root
         password: zks123456
         hikari:
@@ -64,9 +66,9 @@ spring:
         jobExecutorActivate: false
         asyncExecutorEnabled: false
         asyncExecutorActivate: false
-        database-schema-update: true
-        check-process-definitions: true
-        process-definition-location-prefix: classpath:/processes/
+        database-schema-update: false
+        check-process-definitions: false
+        process-definition-location-prefix: classpath:/processes_lims/
     #    process-definition-location-suffixes:
     #      - **.bpmn
     #      - **.bpmn20.xml

+ 2 - 2
src/main/resources/processes_cellsop/cellsop_task_audit.bpmn20.xml

@@ -3,12 +3,12 @@
   <process id="cellsop_task_audit" name="cellsop_task_audit" isExecutable="true">
     <documentation>cellsop实验记录审批</documentation>
     <startEvent id="startEvent1"></startEvent>
-    <userTask id="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" name="试验记录审核提交" activiti:assignee="${recorder}">
+    <userTask id="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7" name="提交审核" activiti:assignee="${recorder}">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <userTask id="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" name="实验记录审核" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" name="审核" activiti:candidateUsers="${users}"></userTask>
     <sequenceFlow id="sid-8D65972C-33B8-4CFD-8933-C212111CB9C0" sourceRef="startEvent1" targetRef="sid-0AF16F3A-3216-4795-94C7-BB40D1941AF7"></sequenceFlow>
     <exclusiveGateway id="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090"></exclusiveGateway>
     <sequenceFlow id="sid-F1EA07DB-9009-4709-B7F3-C942BD09F244" sourceRef="sid-A5254E60-6970-43F6-9C70-95B54B27D57C" targetRef="sid-3A1AC721-EA3D-4DEF-9DA4-815C5A3F4090"></sequenceFlow>