Browse Source

代码修改

LAPTOP-KB9HII50\70708 1 year ago
parent
commit
e92fe8c95b

+ 10 - 25
svr/svr-internet-hospital-entrance/pom.xml

@ -81,25 +81,6 @@
            <!--<groupId>com.yihu.jw</groupId>-->
            <!--<artifactId>common-util</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>${project.parent.version}</version>
            <exclusions>
                <exclusion>
                    <groupId>xalan</groupId>
                    <artifactId>xalan</artifactId>
                </exclusion>
                <exclusion>
                    <artifactId>javax.el</artifactId>
                    <groupId>org.glassfish</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>cron-utils</artifactId>
                    <groupId>com.cronutils</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>im-service</artifactId>
@ -135,10 +116,18 @@
            <artifactId>base-service</artifactId>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>xalan</groupId>
                    <artifactId>xalan</artifactId>
                </exclusion>
                <exclusion>
                    <artifactId>javax.el</artifactId>
                    <groupId>org.glassfish</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>cron-utils</artifactId>
                    <groupId>com.cronutils</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
@ -214,15 +203,11 @@
            <groupId>net.java.dev.jna</groupId>
            <artifactId>jna</artifactId>
            <version>4.2.2</version>
            <scope>system</scope>
            <systemPath>${basedir}/src/main/lib/jna-4.2.2.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>com.zoesoft</groupId>
            <artifactId>zoe-encrypt-sm</artifactId>
            <version>1.0-PK-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${basedir}/src/main/lib/zoe-encrypt-sm-1.0-PK-SNAPSHOT.jar</systemPath>
            <version>1.0</version>
        </dependency>
    </dependencies>
@ -264,7 +249,7 @@
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <excludeTransitive>false</excludeTransitive>
                            <stripVersion>false</stripVersion>
                            <includeScope>runtime</includeScope>
                            <includeScope>compile</includeScope>
                        </configuration>
                    </execution>
                </executions>

+ 2 - 2
svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@ -1,6 +1,6 @@
#通用的配置不用区分环境变量
server:
#  port: ${server.svr-internet-hospital-entrance-port}
  #  port: ${server.svr-internet-hospital-entrance-port}
  port: 10023
spring:
@ -37,7 +37,7 @@ spring:
  application:
    name: svr-internet-hospital-entrance
fast-dfs:
#  tracker-server: 172.26.0.110:22122 #服务器地址
  #  tracker-server: 172.26.0.110:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码