瀏覽代碼

1.更新依赖

2.更新出库单模板路径
dw 3 天之前
父節點
當前提交
171911fcb4
共有 2 個檔案被更改,包括 65 行新增1 行删除
  1. 64
    0
      pom.xml
  2. 1
    1
      src/main/webapp/WEB-INF/config.properties

+ 64
- 0
pom.xml 查看文件

260
             <groupId>org.mybatis.spring.boot</groupId>
260
             <groupId>org.mybatis.spring.boot</groupId>
261
             <artifactId>mybatis-spring-boot-starter</artifactId>
261
             <artifactId>mybatis-spring-boot-starter</artifactId>
262
             <version>1.1.1</version>
262
             <version>1.1.1</version>
263
+            <exclusions>
264
+                <exclusion>
265
+                    <artifactId>logback-classic</artifactId>
266
+                    <groupId>ch.qos.logback</groupId>
267
+                </exclusion>
268
+            </exclusions>
263
         </dependency>
269
         </dependency>
264
 
270
 
265
 
271
 
442
             <groupId>com.bstek.ureport</groupId>
448
             <groupId>com.bstek.ureport</groupId>
443
             <artifactId>ureport2-console</artifactId>
449
             <artifactId>ureport2-console</artifactId>
444
             <version>2.2.9</version>
450
             <version>2.2.9</version>
451
+            <exclusions>
452
+                <exclusion>
453
+                    <artifactId>logback-classic</artifactId>
454
+                    <groupId>ch.qos.Logback</groupId>
455
+                </exclusion>
456
+            </exclusions>
445
         </dependency>
457
         </dependency>
446
 
458
 
447
         <dependency>
459
         <dependency>
463
             <groupId>org.activiti</groupId>
475
             <groupId>org.activiti</groupId>
464
             <artifactId>activiti-engine</artifactId>
476
             <artifactId>activiti-engine</artifactId>
465
             <version>${activiti.version}</version>
477
             <version>${activiti.version}</version>
478
+            <exclusions>
479
+                <exclusion>
480
+                    <groupId>>org.slf4j</groupId>
481
+                    <artifactId>slf4j-log4j12</artifactId>
482
+                </exclusion>
483
+            </exclusions>
466
         </dependency>
484
         </dependency>
467
         <dependency>
485
         <dependency>
468
             <groupId>org.activiti</groupId>
486
             <groupId>org.activiti</groupId>
469
             <artifactId>activiti-spring</artifactId>
487
             <artifactId>activiti-spring</artifactId>
470
             <version>${activiti.version}</version>
488
             <version>${activiti.version}</version>
489
+            <exclusions>
490
+                <exclusion>
491
+                    <groupId>>org.slf4j</groupId>
492
+                    <artifactId>slf4j-log4j12</artifactId>
493
+                </exclusion>
494
+            </exclusions>
471
         </dependency>
495
         </dependency>
472
         <dependency>
496
         <dependency>
473
             <groupId>org.activiti</groupId>
497
             <groupId>org.activiti</groupId>
474
             <artifactId>activiti-json-converter</artifactId>
498
             <artifactId>activiti-json-converter</artifactId>
475
             <version>${activiti.version}</version>
499
             <version>${activiti.version}</version>
500
+            <exclusions>
501
+                <exclusion>
502
+                    <groupId>>org.slf4j</groupId>
503
+                    <artifactId>slf4j-log4j12</artifactId>
504
+                </exclusion>
505
+            </exclusions>
476
         </dependency>
506
         </dependency>
477
 
507
 
478
         <dependency>
508
         <dependency>
492
                     <artifactId>activiti-simple-workflow</artifactId>
522
                     <artifactId>activiti-simple-workflow</artifactId>
493
                     <groupId>org.activiti</groupId>
523
                     <groupId>org.activiti</groupId>
494
                 </exclusion>
524
                 </exclusion>
525
+                    <exclusion>
526
+                        <groupId>>org.slf4j</groupId>
527
+                        <artifactId>slf4j-log4j12</artifactId>
528
+                    </exclusion>
495
             </exclusions>
529
             </exclusions>
496
         </dependency>
530
         </dependency>
497
         <dependency>
531
         <dependency>
498
             <groupId>org.activiti</groupId>
532
             <groupId>org.activiti</groupId>
499
             <artifactId>activiti-modeler</artifactId>
533
             <artifactId>activiti-modeler</artifactId>
500
             <version>${activiti.version}</version>
534
             <version>${activiti.version}</version>
535
+            <exclusions>
536
+                <exclusion>
537
+                    <groupId>>org.slf4j</groupId>
538
+                    <artifactId>slf4j-log4j12</artifactId>
539
+                </exclusion>
540
+            </exclusions>
501
         </dependency>
541
         </dependency>
502
 
542
 
503
 
543
 
505
             <groupId>org.activiti</groupId>
545
             <groupId>org.activiti</groupId>
506
             <artifactId>activiti-rest</artifactId>
546
             <artifactId>activiti-rest</artifactId>
507
             <version>${activiti.version}</version>
547
             <version>${activiti.version}</version>
548
+            <exclusions>
549
+                <exclusion>
550
+                    <groupId>>org.slf4j</groupId>
551
+                    <artifactId>slf4j-log4j12</artifactId>
552
+                </exclusion>
553
+            </exclusions>
508
         </dependency>
554
         </dependency>
509
         <dependency>
555
         <dependency>
510
             <groupId>org.activiti</groupId>
556
             <groupId>org.activiti</groupId>
511
             <artifactId>activiti-diagram-rest</artifactId>
557
             <artifactId>activiti-diagram-rest</artifactId>
512
             <version>${activiti.version}</version>
558
             <version>${activiti.version}</version>
559
+            <exclusions>
560
+                <exclusion>
561
+                    <groupId>>org.slf4j</groupId>
562
+                    <artifactId>slf4j-log4j12</artifactId>
563
+                </exclusion>
564
+            </exclusions>
513
         </dependency>
565
         </dependency>
514
         <dependency>
566
         <dependency>
515
             <groupId>org.activiti</groupId>
567
             <groupId>org.activiti</groupId>
516
             <artifactId>activiti-cxf</artifactId>
568
             <artifactId>activiti-cxf</artifactId>
517
             <version>${activiti.version}</version>
569
             <version>${activiti.version}</version>
570
+            <exclusions>
571
+                <exclusion>
572
+                    <groupId>>org.slf4j</groupId>
573
+                    <artifactId>slf4j-log4j12</artifactId>
574
+                </exclusion>
575
+            </exclusions>
518
         </dependency>
576
         </dependency>
519
         <dependency>
577
         <dependency>
520
             <groupId>org.activiti</groupId>
578
             <groupId>org.activiti</groupId>
521
             <artifactId>activiti-image-generator</artifactId>
579
             <artifactId>activiti-image-generator</artifactId>
522
             <version>${activiti.version}</version>
580
             <version>${activiti.version}</version>
581
+            <exclusions>
582
+                <exclusion>
583
+                    <groupId>>org.slf4j</groupId>
584
+                    <artifactId>slf4j-log4j12</artifactId>
585
+                </exclusion>
586
+            </exclusions>
523
         </dependency>
587
         </dependency>
524
 
588
 
525
     </dependencies>
589
     </dependencies>

+ 1
- 1
src/main/webapp/WEB-INF/config.properties 查看文件

1
 #ureport.fileStoreDir=C:\\thwareUpload\\ureportfiles
1
 #ureport.fileStoreDir=C:\\thwareUpload\\ureportfiles
2
-ureport.fileStoreDir=/home/sam/thwareUpload/ureportfiles
2
+ureport.fileStoreDir=/home/sam/thwareUpload/ureportfiles/mj
3
 licenseKey=YKwznudRJheF/VXncJLppg==
3
 licenseKey=YKwznudRJheF/VXncJLppg==

Loading…
取消
儲存