2
1
lining 6 rokov pred
rodič
commit
519668dac4

+ 1 - 1
src/main/java/com/common/workflow/service/util/Word2Pdf.java

@@ -110,7 +110,7 @@ public class Word2Pdf {
 //            ByteArrayInputStream swapStream = new ByteArrayInputStream(bos..getBytes());
             Document doc = new Document(swapStream);// 原始excel路径
             removeWatermark(doc);
-            insertWatermarkText(doc, watermark, 100, 0);
+//            insertWatermarkText(doc, watermark, 100, 0);
             insertWatermarkText(doc, watermark, 300, 0);
             insertWatermarkText(doc, watermark, 550, 0);
             OutputStream output = response.getOutputStream();

+ 7 - 7
src/main/resources/config/application-prod.yml

@@ -28,12 +28,12 @@ spring:
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
         # 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
+        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:
             auto-commit: false
             minimum-idle: 5
@@ -75,7 +75,7 @@ spring:
         asyncExecutorActivate: false
         database-schema-update: false
         check-process-definitions: false
-        process-definition-location-prefix: classpath:/processes_cellsop/
+        process-definition-location-prefix: classpath:/processes/
     #    process-definition-location-suffixes:
     #      - **.bpmn
     #      - **.bpmn20.xml