hfxc226 il y a 2 ans
Parent
commit
570a79b172

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/controller/ActivitiController.java

@@ -512,7 +512,7 @@ public class ActivitiController {
                 }
             });
         }
-        List<HistoricTaskInstance> tastListFinish  = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().list();
+        List<HistoricTaskInstance> tastListFinish  = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).list();
         if (CollectionUtil.isNotEmpty(tastListFinish)) {
             for(HistoricTaskInstance task: tastListFinish){
                 List<HistoricDetail> list = historyService.createHistoricDetailQuery().

+ 4 - 5
platform-dao/src/main/resources/application-daoProd.yml

@@ -3,9 +3,9 @@ spring:
     druid:
       master:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.0.54:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
+        url: jdbc:mysql://localhost:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
         username: root
-        password: RL_love_hwy_MYSQL_123
+        password: mydm888
         filters: wall,stat
         filter:
           stat:
@@ -32,9 +32,9 @@ spring:
         validation-query: SELECT 'x'
       slave:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.0.54:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
+        url: jdbc:mysql://localhost:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
         username: root
-        password: RL_love_hwy_MYSQL_123
+        password: mydm888
         filters: wall,stat
         filter:
           stat:
@@ -97,7 +97,6 @@ spring:
         temp:
           use_jdbc_metadata_defaults: false
         dialect: org.hibernate.dialect.MySQLDialect
-
 # mybaits配置  tk
 mybatis:
   mapper-locations: classpath:mapper/**/*.xml

+ 0 - 11
platform-rest/src/main/resources/application-dev.yml

@@ -35,17 +35,6 @@ spring:
     port: 6379
     host: localhost
     database: 11
-    jpa:
-      properties:
-        hibernate:
-          temp:
-            use_jdbc_metadata_defaults: false
-          dialect: org.hibernate.dialect.MySQLDialect
-    datasource:
-      druid:
-        stat-view-servlet:
-          login-password: platform8888
-          login-username: root
   servlet:
     multipart:
       maxFileSize: "100MB"

+ 0 - 11
platform-rest/src/main/resources/application-prod.yml

@@ -20,17 +20,6 @@ spring:
     port: 6379
     host: localhost
     database: 1
-    jpa:
-      properties:
-        hibernate:
-          temp:
-            use_jdbc_metadata_defaults: false
-          dialect: org.hibernate.dialect.MySQLDialect
-    datasource:
-      druid:
-        stat-view-servlet:
-          login-password: platform8888
-          login-username: root
   servlet:
     multipart:
       maxFileSize: "100MB"

+ 0 - 6
platform-rest/src/main/resources/application-test.yml

@@ -20,12 +20,6 @@ spring:
     port: 6379
     host: localhost
     database: 4
-  jpa:
-    properties:
-      hibernate:
-        temp:
-          use_jdbc_metadata_defaults: false
-        dialect: org.hibernate.dialect.MySQLDialect
   servlet:
     multipart:
       maxFileSize: "100MB"