代码修改

business/base-service/pom.xml

@@ -31,7 +31,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <!--   poi xml导入导出工具 start-->
@@ -57,7 +57,7 @@
        <dependency>
            <groupId>com.ylz</groupId>
            <artifactId>jdk7-onepay-java-sdk</artifactId>
            <version>20190425</version>
            <version>${version.ylz-onepay}</version>
        </dependency>
        <!-- xlsx  依赖这个包 -->
        <dependency>
@@ -97,13 +97,13 @@
        <dependency>
            <groupId>org.jsoup</groupId>
            <artifactId>jsoup</artifactId>
            <version>1.11.2</version>
            <version>${version.jsoup}</version>
        </dependency>
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
            <version>${version.json-lib}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -114,7 +114,7 @@
        <dependency>
            <groupId>xom</groupId>
            <artifactId>xom</artifactId>
            <version>1.2.5</version>
            <version>${version.xom}</version>
        </dependency>
        <!-- mq消息 end -->
@@ -123,40 +123,39 @@
        <dependency>
            <groupId>org.apache.axis</groupId>
            <artifactId>axis</artifactId>
            <version>1.4</version>
            <version>${version.axis}</version>
        </dependency>
        <dependency>
            <groupId>javax.xml.rpc</groupId>
            <artifactId>javax.xml.rpc-api</artifactId>
            <version>1.1.1</version>
            <version>${version.rpc-api}</version>
        </dependency>
        <dependency>
            <groupId>wsdl4j</groupId>
            <artifactId>wsdl4j</artifactId>
            <version>1.6.2</version>
            <version>${version.wsdl4j}</version>
        </dependency>
        <dependency>
            <groupId>commons-discovery</groupId>
            <artifactId>commons-discovery</artifactId>
            <version>0.5</version>
            <version>${version.commons-discovery}</version>
        </dependency>
        <dependency>
            <groupId>org.assertj</groupId>
            <artifactId>assertj-core</artifactId>
            <version>2.5.0</version>
            <version>${version.assertj}</version>
        </dependency>
        <!-- webService end -->
        <!-- 易联众工具-->
        <dependency>
            <groupId>com.ylz.loginsdk</groupId>
            <artifactId>ehcsdk</artifactId>
            <version>1.0</version>
            <version>${version.ylz-loginsdk}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-redis</artifactId>
            <version>1.8.9.RELEASE</version>
        </dependency>
        <dependency>
@@ -166,41 +165,40 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
            <version>4.3.13.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>28.2-jre</version>
            <version>${version.guava}</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <version>1.18.8</version>
            <version>${version.lombok}</version>
        </dependency>
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
            <version>1.4</version>
            <version>${version.commons-io}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.google.code.kaptcha</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3</version>
            <version>${version.kaptcha}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>cn.jpush.api</groupId>
            <artifactId>jiguang-common</artifactId>
            <version>1.1.9</version>
            <version>${version.jiguang-common}</version>
        </dependency>
        <dependency>
            <groupId>com.zaxxer</groupId>
@@ -210,7 +208,7 @@
        <dependency>
            <groupId>cn.jpush.api</groupId>
            <artifactId>jpush-client</artifactId>
            <version>3.4.8</version>
            <version>${version.jpush-client}</version>
        </dependency>
    </dependencies>

business/es-service/pom.xml

@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
@@ -49,13 +49,13 @@
        <dependency>
            <groupId>org.nlpcn</groupId>
            <artifactId>elasticsearch-sql</artifactId>
            <version>2.4.1.0</version>
            <version>${version.elasticsearch-sql}</version>
        </dependency>
        <!--elasticsearch start-->
        <dependency>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
            <version>3.2.2</version>
            <version>${version.commons.collections}</version>
        </dependency>
        <dependency>
            <groupId>io.searchbox</groupId>
@@ -65,12 +65,12 @@
        <dependency>
            <groupId>org.elasticsearch</groupId>
            <artifactId>elasticsearch</artifactId>
            <version>2.4.6</version>
            <version>${version.elasticsearch}</version>
        </dependency>
        <dependency>
            <groupId>org.elasticsearch.plugin</groupId>
            <artifactId>shield</artifactId>
            <version>2.4.6</version>
            <version>${version.elasticsearch}</version>
        </dependency>
        <!--   poi xml导入导出工具 end -->

business/im-service/pom.xml

@@ -19,7 +19,7 @@
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>

business/sms-service/pom.xml

@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
@@ -59,12 +59,11 @@
        <dependency>
            <groupId>com.tencentcloudapi</groupId>
            <artifactId>tencentcloud-sdk-java</artifactId>
            <version>3.1.272</version>
            <version>${version.tencentcloudapi}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-redis</artifactId>
            <version>1.8.9.RELEASE</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

common/common-entity-es/pom.xml

@@ -31,17 +31,17 @@
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-elasticsearch</artifactId>
            <version>2.1.3.RELEASE</version>
            <version>${version.data-elasticsearch}</version>
        </dependency>
        <dependency>
            <groupId>io.searchbox</groupId>
            <artifactId>jest-common</artifactId>
            <version>2.4.0</version>
            <version>${version.jest}</version>
        </dependency>
        <dependency>
            <groupId>net.java.dev.jna</groupId>
            <artifactId>jna</artifactId>
            <version>4.1.0</version>
            <version>${version.jna}</version>
        </dependency>
    </dependencies>
</project>

common/common-rest-model-es/pom.xml

@@ -17,7 +17,7 @@
        <dependency>
            <groupId>io.searchbox</groupId>
            <artifactId>jest-common</artifactId>
            <version>2.4.0</version>
            <version>${version.jest}</version>
        </dependency>
        <dependency>
            <groupId>io.swagger</groupId>
@@ -26,7 +26,7 @@
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-elasticsearch</artifactId>
            <version>2.1.3.RELEASE</version>
            <version>${version.data-elasticsearch}</version>
        </dependency>
    </dependencies>

common/common-rest-model/pom.xml

@@ -54,7 +54,6 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
            <version>4.3.13.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>

common/common-util/pom.xml

@@ -26,7 +26,7 @@
        <dependency>
            <groupId>com.github.stuxuhai</groupId>
            <artifactId>jpinyin</artifactId>
            <version>1.1.8</version>
            <version>${version.jpinyin}</version>
        </dependency>
        <dependency>
            <groupId>org.json</groupId>
@@ -72,7 +72,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>jave-ffmpegjave</artifactId>
            <version>1.0.4</version>
            <version>${version.jave-ffmpegjave}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
@@ -85,7 +85,6 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
            <version>4.3.13.RELEASE</version>
        </dependency>
        <!--   poi xml导入导出工具 start-->

gateway/ag-basic/pom.xml

@@ -59,7 +59,7 @@
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
            <version>${version.net-json}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -129,13 +129,13 @@
        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>
            <version>1.3.1</version>
            <version>${version.commons-fileupload}</version>
        </dependency>
        <!--oracle驱动-->
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
            <version>${version.oracle}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>

server/svr-authentication/pom.xml

@@ -61,15 +61,11 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-feign</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-ribbon</artifactId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
        <dependency>
            <groupId>com.zaxxer</groupId>
@@ -80,7 +76,7 @@
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
            <version>${version.json-lib}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -131,7 +127,7 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>
@@ -144,7 +140,7 @@
        <dependency>
            <groupId>com.ylz.loginsdk</groupId>
            <artifactId>ehcsdk</artifactId>
            <version>1.0</version>
            <version>${version.ylz-loginsdk}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
@@ -164,28 +160,28 @@
        <dependency>
            <groupId>com.google.code.kaptcha</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3</version>
            <version>${version.kaptcha}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>axis</groupId>
            <artifactId>axis-jaxrpc</artifactId>
            <version>1.4</version>
            <version>${version.axis}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.axis</groupId>
            <artifactId>axis</artifactId>
            <version>1.4</version>
            <version>${version.axis}</version>
        </dependency>
        <dependency>
            <groupId>commons-discovery</groupId>
            <artifactId>commons-discovery</artifactId>
            <version>0.5</version>
            <version>${version.commons-discovery}</version>
        </dependency>
        <dependency>
            <groupId>javax.wsdl</groupId>
@@ -196,7 +192,7 @@
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
            <version>${version.oracle}</version>
        </dependency>
        <dependency>

svr/svr-cloud-care/pom.xml

@@ -65,16 +65,6 @@
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>com.ylz.loginsdk</groupId>-->
            <!--<artifactId>ehcsdk</artifactId>-->
            <!--<version>1.0</version>-->
        <!--</dependency>-->
<!--        <dependency>
            <groupId>com.ylz.dmrh</groupId>
            <artifactId>ehcsdk-java-sdk-base</artifactId>
            <version>1.0.3</version>
        </dependency>-->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>

wlyy-parent-pom/pom.xml

@@ -82,6 +82,7 @@
        <!-- Version start -->
        <version.spring-cloud>Hoxton.SR12</version.spring-cloud>
        <version.wlyy-common>2.4.0</version.wlyy-common>
        <version.yihu-common>2.0.0</version.yihu-common>
        <version.jackson>2.8.10</version.jackson>
        <verion.fastjson>1.2.83</verion.fastjson>
        <version.json>20220320</version.json>
@@ -108,14 +109,18 @@
        <version.commons-dbcp2>2.1.1</version.commons-dbcp2>
        <version.commons-lang3>3.4</version.commons-lang3>
        <version.commons.collections>3.2.2</version.commons.collections>
        <version.commons-fileupload>1.3.1</version.commons-fileupload>
        <version.commons-discovery>0.5</version.commons-discovery>
        <version.commons-io>2.4</version.commons-io>
        <version.hibernate>5.0.12.Final</version.hibernate>
        <version.hibernate-validator>6.0.10.Final</version.hibernate-validator>
        <version.hibernate-jpa-api>1.0.0.Final</version.hibernate-jpa-api>
        <version.elasticsearch>2.4.0</version.elasticsearch>
        <version.elasticsearch>2.4.6</version.elasticsearch>
        <version.elasticsearch-sql>2.4.1.0</version.elasticsearch-sql>
        <version.data-elasticsearch>2.1.3.RELEASE</version.data-elasticsearch>
        <version.jest>2.4.0</version.jest>
        <version.druid>1.0.15</version.druid>
        <version.jna>3.0.9</version.jna>
        <version.jna>4.1.0</version.jna>
        <version.hbase-client>2.2.4</version.hbase-client>
        <version.spring-data-hadoop>2.2.0.RELEASE</version.spring-data-hadoop>
        <version.spring-data-solr>2.1.3.RELEASE</version.spring-data-solr>
@@ -124,7 +129,23 @@
        <version.pinyin4j>2.5.0</version.pinyin4j>
        <version.cat>2.0.0</version.cat>
        <version.feign-okhttp>9.3.1</version.feign-okhttp>
        <version.oracle>11.2.0.3</version.oracle>
        <version.jpinyin>1.1.8</version.jpinyin>
        <version.jave-ffmpegjave>1.0.4</version.jave-ffmpegjave>
        <version.ylz-onepay>20190425</version.ylz-onepay>
        <version.jsoup>1.11.2</version.jsoup>
        <version.xom>1.2.5</version.xom>
        <version.axis>1.4</version.axis>
        <version.rpc-api>1.1.1</version.rpc-api>
        <version.wsdl4j>1.6.2</version.wsdl4j>
        <version.assertj>2.5.0</version.assertj>
        <version.guava>28.2-jre</version.guava>
        <version.lombok>1.18.8</version.lombok>
        <version.ylz-loginsdk>1.0</version.ylz-loginsdk>
        <version.kaptcha>2.3</version.kaptcha>
        <version.jiguang-common>1.1.9</version.jiguang-common>
        <version.jpush-client>3.4.8</version.jpush-client>
        <version.tencentcloudapi>3.1.272</version.tencentcloudapi>
        <!-- Version end -->
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>