From 5b748d64f28b9ec19690251b922ad07359d0afc2 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期四, 28 五月 2020 10:43:48 +0800
Subject: [PATCH] 修复 json转换导致 视图分发失败
---
pom.xml | 269 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 214 insertions(+), 55 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3cb3630..d5dddf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,10 +68,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.boot</groupId>-->
+ <!--<artifactId>spring-boot-starter-security</artifactId>-->
+ <!--</dependency>-->
<!-- swagger -->
<dependency>
@@ -264,12 +264,12 @@
<artifactId>batik-svggen</artifactId>
<version>1.7</version>
</dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>4.1.3.RELEASE</version>
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.security</groupId>-->
+ <!--<artifactId>spring-security-config</artifactId>-->
+ <!--<version>4.1.3.RELEASE</version>-->
- </dependency>
+ <!--</dependency>-->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
@@ -284,27 +284,27 @@
<!-- settle -->
<!-- with pentaho-kettle -->
- <dependency>
- <groupId>pentaho-kettle</groupId>
- <artifactId>kettle-core</artifactId>
- <version>${kettle-version}</version>
- </dependency>
- <dependency>
- <groupId>pentaho-kettle</groupId>
- <artifactId>kettle-engine</artifactId>
- <version>${kettle-version}</version>
- </dependency>
- <dependency>
- <groupId>pentaho</groupId>
- <artifactId>metastore</artifactId>
- <version>${kettle-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>pentaho-kettle</groupId>-->
+ <!--<artifactId>kettle-core</artifactId>-->
+ <!--<version>${kettle-version}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>pentaho-kettle</groupId>-->
+ <!--<artifactId>kettle-engine</artifactId>-->
+ <!--<version>${kettle-version}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>pentaho</groupId>-->
+ <!--<artifactId>metastore</artifactId>-->
+ <!--<version>${kettle-version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>pentaho-kettle</groupId>
- <artifactId>kettle-dbdialog</artifactId>
- <version>${kettle-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>pentaho-kettle</groupId>-->
+ <!--<artifactId>kettle-dbdialog</artifactId>-->
+ <!--<version>${kettle-version}</version>-->
+ <!--</dependency>-->
<!--<dependency>-->
<!--<groupId>pentaho</groupId>-->
@@ -324,11 +324,11 @@
<version>1.1.9</version>
</dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.58</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.alibaba</groupId>-->
+ <!--<artifactId>fastjson</artifactId>-->
+ <!--<version>1.2.58</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -380,16 +380,16 @@
<version>1.60</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core</artifactId>
- <version>4.7.0-HBase-1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>1.1.2</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.phoenix</groupId>-->
+ <!--<artifactId>phoenix-core</artifactId>-->
+ <!--<version>4.7.0-HBase-1.1</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.hbase</groupId>-->
+ <!--<artifactId>hbase-client</artifactId>-->
+ <!--<version>1.1.2</version>-->
+ <!--</dependency>-->
<!-- poi -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -426,18 +426,25 @@
<!--<version>${kettle-version}</version>-->
<!--<scope>compile</scope>-->
<!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>pentaho</groupId>-->
+ <!--<artifactId>pentaho-database-model</artifactId>-->
+ <!--<version>${kettle-version}</version>-->
+ <!--<scope>compile</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>pentaho</groupId>-->
+ <!--<artifactId>pentaho-metadata</artifactId>-->
+ <!--<version>${kettle-version}</version>-->
+ <!--<scope>compile</scope>-->
+ <!--</dependency>-->
<dependency>
- <groupId>pentaho</groupId>
- <artifactId>pentaho-database-model</artifactId>
- <version>${kettle-version}</version>
- <scope>compile</scope>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.3</version>
</dependency>
- <dependency>
- <groupId>pentaho</groupId>
- <artifactId>pentaho-metadata</artifactId>
- <version>${kettle-version}</version>
- <scope>compile</scope>
- </dependency>
+
+
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
@@ -454,6 +461,13 @@
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId>
<version>1.7</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.10</version>
</dependency>
@@ -477,8 +491,144 @@
</dependencies>
<build>
-
+ <finalName>mdm-1.2.0</finalName>
<plugins>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-assembly-plugin</artifactId>-->
+ <!--<version>3.1.1</version>-->
+ <!--<configuration>-->
+ <!--<encoding>UTF-8</encoding>-->
+ <!--<descriptorRefs>-->
+ <!--<descriptorRef>jar-with-dependencies</descriptorRef>-->
+ <!--</descriptorRefs>-->
+ <!--<archive>-->
+ <!--<manifest>-->
+ <!--<mainClass>com.highdatas.mdm.MdmApplication</mainClass>-->
+ <!--</manifest>-->
+ <!--</archive>-->
+ <!--</configuration>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>make-assembly</id>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>single</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
+
+
+ <!--<!– 浠ｇ爜娣锋穯鎻掍欢 –>-->
+ <!--<plugin>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.proguard</groupId>-->
+ <!--<artifactId>proguard-base</artifactId>-->
+ <!--<!– 2019骞�7鏈�15鏃� jdk1.8 鍏煎鎬ц繕鍙互 –>-->
+ <!--<version>6.0.2</version>-->
+ <!--<scope>runtime</scope>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--<groupId>com.github.wvengen</groupId>-->
+ <!--<artifactId>proguard-maven-plugin</artifactId>-->
+ <!--<!– 2019骞�7鏈�15鏃� jdk1.8 鍏煎鎬ц繕鍙互 –>-->
+ <!--<version>2.0.14</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<!– 娣锋穯鏃跺埢锛岃繖閲屾槸鎵撳寘鐨勬椂鍊欐贩娣� –>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<!– 浣跨敤鎻掍欢鐨勪粈涔堝姛鑳斤紝褰撶劧鏄贩娣� –>-->
+ <!--<goal>proguard</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--<configuration>-->
+ <!--<!– 鏄惁灏嗙敓鎴愮殑PG鏂囦欢瀹夎閮ㄧ讲 –>-->
+ <!--<attach>true</attach>-->
+ <!--<!– 鏄惁娣锋穯 –>-->
+ <!--<obfuscate>true</obfuscate>-->
+ <!--<!– 鎸囧畾鐢熸垚鏂囦欢鍒嗙被 –>-->
+ <!--<attachArtifactClassifier>pg</attachArtifactClassifier>-->
+ <!--<!– ProGuard閰嶇疆鍙傛暟(鍙紩鐢╟fg閰嶇疆鏂囦欢) –>-->
+ <!--<options>-->
+ <!--<!– JDK鐩爣鐗堟湰1.8–>-->
+ <!--<option>-target 1.8</option>-->
+ <!--<!– 涓嶅仛鏀剁缉锛堝垹闄ゆ敞閲娿�佹湭琚紩鐢ㄤ唬鐮侊級 –>-->
+ <!--<option>-dontshrink</option>-->
+ <!--<!– 涓嶅仛浼樺寲锛堝彉鏇翠唬鐮佸疄鐜伴�昏緫锛� –>-->
+ <!--<option>-dontoptimize</option>-->
+ <!--<!– 涓嶈矾杩囬潪鍏敤绫绘枃浠跺強鎴愬憳 –>-->
+ <!--<option>-dontskipnonpubliclibraryclasses</option>-->
+ <!--<option>-dontskipnonpubliclibraryclassmembers</option>-->
+ <!--<!–涓嶇敤澶у皬鍐欐贩鍚堢被鍚嶆満鍒�–>-->
+ <!--<option>-dontusemixedcaseclassnames</option>-->
+ <!--<!– 浼樺寲鏃跺厑璁歌闂苟淇敼鏈変慨楗扮鐨勭被鍜岀被鐨勬垚鍛� –>-->
+ <!--<option>-allowaccessmodification</option>-->
+ <!--<!– 纭畾缁熶竴鐨勬贩娣嗙被鐨勬垚鍛樺悕绉版潵澧炲姞娣锋穯 –>-->
+ <!--<option>-useuniqueclassmembernames</option>-->
+ <!--<!– 涓嶆贩娣嗘墍鏈夊寘鍚嶏紝鏁翠綋娣锋穯浼氬嚭鐜板悇绉嶅悇鏍风殑闂 绋嬪簭鍙堜笉浼氭妸浣犺寮曠敤鐨勫湴鏂瑰紩鐢ㄥソ 浼氱洿鎺ヤ慨鏀圭被鍚� 鍙傛暟鍚嶇殑 寤鸿涓嶅幓闄� 鏈夎繖涓爣绛剧殑璇� <option>-keep class !com.package.** { *; }</option> 鍔犲叆杩欎釜鏍囩鐨勬姤鍖呭悕绋嬪簭鎵嶄細淇敼 –>-->
+ <!--<option>-keeppackagenames</option>-->
+ <!--<option>-adaptclassstrings</option>-->
+ <!--<!– <option>-keepdirectories</option> –>-->
+ <!--<!– 涓嶆贩娣嗘墍鏈夌壒娈婄殑绫� –>-->
+ <!--<option>-keepattributes-->
+ <!--Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,LocalVariable*Table,*Annotation*,Synthetic,EnclosingMethod-->
+ <!--</option>-->
+ <!--<!– This option will save all original methods parameters in files defined-->
+ <!--in -keep sections, otherwise all parameter names will be obfuscate. –>-->
+ <!--<option>-keepparameternames</option>-->
+ <!--<option>-keepclassmembers class * {-->
+ <!--@org.springframework.beans.factory.annotation.Autowired *;-->
+ <!--@org.springframework.beans.factory.annotation.Value *;-->
+ <!--}-->
+ <!--</option>-->
+ <!--<!– 娣锋穯杩欎釜鍖呬笅鐨勭被 姝ゅ闇�瑕佹洿鏀逛负鑷繁闇�瑕佹贩娣嗙殑鍖呭悕–>-->
+ <!--<option>-keep class !com.highdatas.mdm.process.** { *; }</option>-->
+ <!--<option>-keep class !com.highdatas.mdm.service.** { *; }</option>-->
+ <!--<option>-keep class !com.highdatas.mdm.controller.** { *; }</option>-->
+
+ <!--<!– 涓嶆贩娣唌ain鏂规硶 姝ゅ闇�瑕佹洿鏀逛负鑷繁鐨勫惎鍔ㄧ被璺緞 –>-->
+ <!--<option>-keep class com.highdatas.mdm.MdmApplication { *; }</option>-->
+ <!--<option>-keep class com.highdatas.mdm.util.** { *; }</option>-->
+ <!--<option>-keep class com.highdatas.mdm.mapper.** { *; }</option>-->
+ <!--<option>-keep class com.highdatas.mdm.job.** { *; }</option>-->
+ <!--<option>-keep class com.highdatas.mdm.pojo.** { *; }</option>-->
+ <!--<option>-keep class com.highdatas.mdm.entity.** { *; }</option>-->
+
+ <!--<!– 涓嶆贩娣嗘墍鏈夌殑set/get鏂规硶锛屾瘯绔熼」鐩腑浣跨敤鐨勯儴鍒嗙涓夋柟妗嗘灦锛堜緥濡係hiro锛変細鐢ㄥ埌澶ч噺鐨剆et/get鏄犲皠 –>-->
+ <!--<option>-keepclassmembers public class * {void set*(***);*** get*();}</option>-->
+ <!--<!– 涓嶆贩娣嗗寘涓殑鎵�鏈夌被浠ュ強绫荤殑灞炴�у強鏂规硶锛屽疄浣撳寘锛屾贩娣嗕簡浼氬鑷碠RM妗嗘灦鍙婂墠绔棤娉曡瘑鍒� –>-->
+
+ <!--<!– 涓嶅鍖呯被鐨勭被鍚嶈繘琛屾贩娣嗭紝浣嗗绫讳腑鐨勫睘鎬у拰鏂规硶娣锋穯 –>-->
+ <!--<!–<option>-keep class com.package.util.** </option>–>-->
+ <!--<!– <option>-keep class com.example.service.** </option>–>-->
+
+ <!--<!– 涓嶆贩娣嗗寘涓嬬殑鎵�鏈夌被鍚嶏紝涓旂被涓殑鏂规硶鍜屽睘鎬т篃涓嶆贩娣� 妤间富宸茬粡鎶婂畠娉ㄦ帀浜� 鍥犱负娌＄敤鍒� –>-->
+ <!--<!–<option>-keep class com.example.redis.** { *; }</option>-->
+ <!--<option>-keep class com.example.domain.** { *; }</option>-->
+ <!--<option>-keep class com.example.dto.** { *; } </option>-->
+ <!--<option>-keep class com.example.config.**{ *; }</option>-->
+ <!--<option>-keep class com.example.dao.** { *; }</option>–>-->
+ <!--<!– 鏃犺璺宠繃璀﹀憡 鍥犱负淇敼浠ｇ爜鐨勮繃绋嬬▼搴忔娴嬪埌鏈変簺鏂囦欢涓嶈兘鏇存敼灏变細鎶ヨ鍛婂鑷村け璐� 濡傛灉瀵硅嚜宸卞啓鐨勪唬鐮佹瘮杈冩湁淇″績鐨勮瘽鍙互鐩存帴鏃犺 –>-->
+ <!--<option>-dontwarn **</option>-->
+ <!--</options>-->
+ <!--<!–class 娣锋穯鍚庤緭鍑虹殑jar鍖� –>-->
+ <!--<outjar>${project.build.finalName}-pg.jar</outjar>-->
+ <!--<!– 娣锋穯鏃堕渶瑕佸紩鐢ㄧ殑java搴擄紝杩欎簺搴撶殑绫讳笉浼氬仛娣锋穯 –>-->
+ <!--<libs>-->
+ <!--<lib>${java.home}/lib/rt.jar</lib>-->
+ <!--<lib>${java.home}/lib/jce.jar</lib>-->
+ <!--</libs>-->
+ <!--<!– 闇�瑕佸仛娣锋穯鐨刯ar鎴栫洰褰� –>-->
+ <!--<injar>classes</injar>-->
+ <!--<!– 杈撳嚭鐩綍 –>-->
+ <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -519,6 +669,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+
+ </plugin>
</plugins>
--
Gitblit v1.8.0