Browse Source

代码修改

LAPTOP-KB9HII50\70708 2 years ago
parent
commit
b2a637a8c5

+ 1 - 1
server/svr-authentication/src/main/resources/application.yml

@ -770,7 +770,7 @@ spring:
    username: root
    password: 4D^tK%!4
  redis:
    host: 172.26.0.153 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6390 # Redis server port.
    password: Kb6wKDQP1W4

+ 12 - 5
svr/svr-base/pom.xml

@ -65,7 +65,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>im-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
@ -189,7 +189,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>xalan</groupId>
@ -201,7 +201,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <!--   poi xml导入导出工具 end -->
@ -209,9 +209,13 @@
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
            <version>${version.oracle}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-pool2</artifactId>
            <version>2.4.2</version>
        </dependency>
    </dependencies>
    <build>
@ -220,6 +224,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>3.2.0</version>
                <configuration>
                    <archive>
                        <!-- 生成的jar中,不要包含pom.xml和pom.properties这两个文件 -->
@ -238,6 +243,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>3.2.0</version>
                <executions>
                    <execution>
                        <id>copy-lib</id>
@ -259,6 +265,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>3.2.0</version>
                <configuration>
                    <archive>
                        <!-- 指定配置文件目录,这样jar运行时会去找到同目录下的resources文件夹下查找 -->

+ 1 - 1
svr/svr-base/src/main/resources/application.yml

@ -993,7 +993,7 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: 1
---
spring: