Browse Source

代码修改

LAPTOP-KB9HII50\70708 2 years ago
parent
commit
13cf059989
44 changed files with 57 additions and 55 deletions
  1. 1 1
      app/app-iot-server/pom.xml
  2. 1 1
      app/public-health-server/pom.xml
  3. 1 1
      business/base-service/pom.xml
  4. 1 1
      business/im-service/pom.xml
  5. 1 1
      business/push-service/pom.xml
  6. 1 1
      business/sms-service/pom.xml
  7. 1 1
      common/common-entity-es/pom.xml
  8. 1 1
      common/common-entity/pom.xml
  9. 1 1
      common/common-exception/pom.xml
  10. 5 5
      common/common-fegin/pom.xml
  11. 1 1
      common/common-request-mapping/pom.xml
  12. 1 1
      common/common-rest-model-es/pom.xml
  13. 1 1
      common/common-rest-model/pom.xml
  14. 1 1
      common/common-util/pom.xml
  15. 2 1
      gateway/ag-basic/pom.xml
  16. 1 1
      server/svr-admin-server/pom.xml
  17. 1 1
      server/svr-authentication/pom.xml
  18. 1 1
      server/svr-configuration/pom.xml
  19. 1 1
      server/svr-dashboard/pom.xml
  20. 1 1
      server/svr-discovery/pom.xml
  21. 1 1
      svr/svr-base/pom.xml
  22. 1 1
      svr/svr-cloud-care/pom.xml
  23. 1 1
      svr/svr-cloud-device/pom.xml
  24. 1 1
      svr/svr-cloud-job/pom.xml
  25. 1 1
      svr/svr-cloud-medicine/pom.xml
  26. 1 1
      svr/svr-cloud-transfor/pom.xml
  27. 1 1
      svr/svr-door-service/pom.xml
  28. 1 1
      svr/svr-healthy-house/pom.xml
  29. 2 2
      svr/svr-internet-hospital-entrance/pom.xml
  30. 2 2
      svr/svr-internet-hospital-job/pom.xml
  31. 1 1
      svr/svr-internet-hospital/pom.xml
  32. 1 1
      svr/svr-iot-job/pom.xml
  33. 1 1
      svr/svr-iot-sn/pom.xml
  34. 1 1
      svr/svr-iot/pom.xml
  35. 1 1
      svr/svr-manage/pom.xml
  36. 2 2
      svr/svr-patient/pom.xml
  37. 1 1
      svr/svr-rehabilitation/pom.xml
  38. 1 1
      svr/svr-statistics/pom.xml
  39. 1 1
      svr/svr-wlyy-archives/pom.xml
  40. 1 1
      svr/svr-wlyy-health-bank/pom.xml
  41. 1 1
      svr/svr-wlyy-specialist/pom.xml
  42. 1 1
      svr/svr-wlyy/pom.xml
  43. 4 3
      wlyy-parent-pom/pom.xml
  44. 3 3
      wlyy-starter/pom.xml

+ 1 - 1
app/app-iot-server/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.ehr.iot</groupId>
    <artifactId>app-iot-server</artifactId>
    <packaging>war</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <!-- 依赖包 -->
    <dependencies>

+ 1 - 1
app/public-health-server/pom.xml

@ -4,7 +4,7 @@
    <groupId>com.yihu.ehr.iot</groupId>
    <artifactId>public-health-server</artifactId>
    <packaging>war</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <parent>
        <groupId>com.yihu.jw</groupId>

+ 1 - 1
business/base-service/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>base-service</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
business/im-service/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>im-service</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
business/push-service/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>push-service</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
business/sms-service/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>sms-service</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
common/common-entity-es/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-entity-es</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>

+ 1 - 1
common/common-entity/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-entity</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
common/common-exception/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-exception</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>

+ 5 - 5
common/common-fegin/pom.xml

@ -12,28 +12,28 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-fegin</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-exception</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model-es</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>

+ 1 - 1
common/common-request-mapping/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-request-mapping</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>

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

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-rest-model-es</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>
            <groupId>io.searchbox</groupId>

+ 1 - 1
common/common-rest-model/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-rest-model</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
common/common-util/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-util</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 2 - 1
gateway/ag-basic/pom.xml

@ -11,7 +11,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>ag-basic</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <packaging>jar</packaging>
    <dependencies>
@ -211,6 +211,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>3.2.0</version>
                <configuration>
                    <archive>
                        <!-- 指定配置文件目录,这样jar运行时会去找到同目录下的resources文件夹下查找 -->

+ 1 - 1
server/svr-admin-server/pom.xml

@ -11,7 +11,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>svr-admin-server</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>

+ 1 - 1
server/svr-authentication/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-authentication</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
server/svr-configuration/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-configuration</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <packaging>jar</packaging>
    <dependencies>

+ 1 - 1
server/svr-dashboard/pom.xml

@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-dashboard</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
server/svr-discovery/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-discovery</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <packaging>jar</packaging>
    <dependencies>

+ 1 - 1
svr/svr-base/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-base</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-cloud-care/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-cloud-care</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-cloud-device/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-cloud-device</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
svr/svr-cloud-job/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-cloud-job</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-cloud-medicine/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-cloud-medicine</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-cloud-transfor/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-cloud-transfor</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-door-service/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-door-service</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-healthy-house/pom.xml

@ -12,7 +12,7 @@
	<groupId>com.yihu.jw</groupId>
	<artifactId>svr-healthy-house</artifactId>
	<version>${parent.version}</version>
	<version>${project.parent.version}</version>
	<packaging>jar</packaging>
	<name>svr-healthy-house</name>

+ 2 - 2
svr/svr-internet-hospital-entrance/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital-entrance</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->
@ -97,7 +97,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>

+ 2 - 2
svr/svr-internet-hospital-job/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital-job</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->
@ -74,7 +74,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>

+ 1 - 1
svr/svr-internet-hospital/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-iot-job/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-iot-job</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-iot-sn/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.iot</groupId>
    <artifactId>svr-iot-sn</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <packaging>war</packaging>
    <dependencies>

+ 1 - 1
svr/svr-iot/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.iot</groupId>
    <artifactId>svr-iot</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <packaging>jar</packaging>
    <dependencies>

+ 1 - 1
svr/svr-manage/pom.xml

@ -12,7 +12,7 @@
    <artifactId>svr-manage</artifactId>
    <packaging>war</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>

+ 2 - 2
svr/svr-patient/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-patient</artifactId>
    <packaging>war</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->
@ -91,7 +91,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>${parent.version}</version>
            <version>${project.parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>

+ 1 - 1
svr/svr-rehabilitation/pom.xml

@ -11,7 +11,7 @@
	<groupId>com.yihu.rehabilitation</groupId>
	<artifactId>svr-rehabilitation</artifactId>
	<version>${parent.version}</version>
	<version>${project.parent.version}</version>
	<packaging>jar</packaging>
	<dependencies>

+ 1 - 1
svr/svr-statistics/pom.xml

@ -11,7 +11,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-statistics</artifactId>
    <packaging>war</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <modelVersion>4.0.0</modelVersion>
    <!--<packaging>jar</packaging>-->

+ 1 - 1
svr/svr-wlyy-archives/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.archives</groupId>
    <artifactId>svr-wlyy-archives</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 1 - 1
svr/svr-wlyy-health-bank/pom.xml

@ -13,7 +13,7 @@
    <groupId>com.yihu.health.bank</groupId>
    <artifactId>svr-wlyy-health-bank</artifactId>
    <packaging>war</packaging>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <!-- 支持Tomcat启动 -->

+ 1 - 1
svr/svr-wlyy-specialist/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.specialist</groupId>
    <artifactId>svr-wlyy-specialist</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <packaging>war</packaging>
    <dependencies>

+ 1 - 1
svr/svr-wlyy/pom.xml

@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-wlyy</artifactId>
    <version>${parent.version}</version>
    <version>${project.parent.version}</version>
    <dependencies>
        <dependency>

+ 4 - 3
wlyy-parent-pom/pom.xml

@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>2.4.0</version>
        <version>2.3.9.RELEASE</version>
    </parent>
    <groupId>com.yihu.jw</groupId>
@ -80,10 +80,11 @@
    <properties>
        <!-- Version start -->
        <version.spring-cloud>Hoxton.SR12</version.spring-cloud>
        <version.wlyy-common>2.4.0</version.wlyy-common>
        <version.jackson>2.8.1</version.jackson>
        <verion.fastjson>1.2.83</verion.fastjson>
        <version.json>20160212</version.json>
        <version.json>20220320</version.json>
        <version.net-json>2.4</version.net-json>
        <version.logback>1.2.3</version.logback>
        <version.quartz>2.3.0</version.quartz>
@ -119,7 +120,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-dependencies</artifactId>
                <version>2020.0.5</version>
                <version>${version.spring-cloud}</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>

+ 3 - 3
wlyy-starter/pom.xml

@ -7,7 +7,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>2.4.0</version>
        <version>2.3.9.RELEASE</version>
    </parent>
    <!-- Self -->
@ -32,7 +32,7 @@
    </distributionManagement>
    <properties>
        <version.spring-cloud>Edgware.SR4</version.spring-cloud>
        <version.spring-cloud>Hoxton.SR12</version.spring-cloud>
        <version.jackson>2.8.10</version.jackson>
        <version.fastdfs>1.27</version.fastdfs>
        <version.swagger>2.7.0</version.swagger>
@ -56,7 +56,7 @@
        <version.spring-data-hadoop>2.2.0.RELEASE</version.spring-data-hadoop>
        <version.spring-data-solr>2.1.3.RELEASE</version.spring-data-solr>
        <version.bcprov-jdk15on>1.59</version.bcprov-jdk15on>
        <version.json>20160212</version.json>
        <version.json>20220320</version.json>
        <version.json-lib>2.4</version.json-lib>
        <version.pinyin4j>2.5.0</version.pinyin4j>
        <version.cat>2.0.0</version.cat>