Home Explore Help
Register Sign In
liubing
/
wlyy2.0
forked from Amoy2/wlyy2.0
Watch 1
Star 0
Fork 0
Files
Browse Source

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

yeshijie 4 years ago
parent
a3b302bdb8 6926840908
commit
3032860bda
2 changed files with 156 additions and 35 deletions
Split View Show Diff Stats
  1. 70 17
      svr/svr-cloud-job/pom.xml
  2. 86 18
      svr/svr-cloud-job/src/main/resources/application.yml

+ 70 - 17
svr/svr-cloud-job/pom.xml
View File 

@ -153,31 +153,84 @@
 
        <finalName>svr-cloud-job</finalName>
 
        <plugins>
 
            <plugin>
 
                <groupId>org.springframework.boot</groupId>
 
                <artifactId>spring-boot-maven-plugin</artifactId>
 
                <groupId>org.apache.maven.plugins</groupId>
 
                <artifactId>maven-jar-plugin</artifactId>
 
                <configuration>
 
                    <mainClass>com.yihu.CloudApplicationJob</mainClass>
 
                    <archive>
 
                        <!-- 生成的jar中，不要包含pom.xml和pom.properties这两个文件 -->
 
                        <addMavenDescriptor>false</addMavenDescriptor>
 
                        <manifest>
 
                            <!-- 是否要把第三方jar加入到类构建路径 -->
 
                            <addClasspath>true</addClasspath>
 
                            <!-- 外部依赖jar包的最终位置 -->
 
                            <classpathPrefix>lib/</classpathPrefix>
 
                            <mainClass>com.yihu.CloudApplicationJob</mainClass>
 
                        </manifest>
 
                    </archive>
 
                </configuration>
 
            </plugin>
 
            <!--拷贝依赖到jar外面的lib目录-->
 
            <plugin>
 
                <artifactId>maven-war-plugin</artifactId>
 
                <groupId>org.apache.maven.plugins</groupId>
 
                <artifactId>maven-dependency-plugin</artifactId>
 
                <executions>
 
                    <execution>
 
                        <id>copy-lib</id>
 
                        <phase>package</phase>
 
                        <goals>
 
                            <goal>copy-dependencies</goal>
 
                        </goals>
 
                        <configuration>
 
                            <!-- 依赖包输出目录，将来不打进jar包里 -->
 
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
 
                            <excludeTransitive>false</excludeTransitive>
 
                            <stripVersion>false</stripVersion>
 
                            <includeScope>runtime</includeScope>
 
                        </configuration>
 
                    </execution>
 
                </executions>
 
            </plugin>
 
            <!--指定配置文件，将resources打成外部resource-->
 
            <plugin>
 
                <groupId>org.apache.maven.plugins</groupId>
 
                <artifactId>maven-jar-plugin</artifactId>
 
                <configuration>
 
                    <failOnMissingWebXml>false</failOnMissingWebXml>
 
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
 
                    <archive>
 
                        <!-- 指定配置文件目录，这样jar运行时会去找到同目录下的resources文件夹下查找 -->
 
                        <manifestEntries>
 
                            <Class-Path>resources/</Class-Path>
 
                        </manifestEntries>
 
                    </archive>
 
                    <!-- 打包时忽略的文件（也就是不打进jar包里的文件） -->
 
                    <excludes>
 
                        <exclude>**/*.yml</exclude>
 
                        <exclude>**/*.xml</exclude>
 
                    </excludes>
 
                </configuration>
 
            </plugin>
 
            <!-- 拷贝资源文件 外面的resource目录-->
 
            <plugin>
 
                <artifactId>maven-resources-plugin</artifactId>
 
                <executions>
 
                    <execution>
 
                        <id>copy-dependencies</id>
 
                        <phase>package</phase>
 
                        <goals>
 
                            <goal>copy-resources</goal>
 
                        </goals>
 
                        <configuration>
 
                            <!-- 资源文件输出目录 -->
 
                            <outputDirectory>${project.build.directory}/resources</outputDirectory>
 
                            <resources>
 
                                <resource>
 
                                    <directory>src/main/resources</directory>
 
                                </resource>
 
                            </resources>
 
                        </configuration>
 
                    </execution>
 
                </executions>
 
            </plugin>
 
        </plugins>
 
        <resources>
 
            <!--指定资源的位置-->
 
            <resource>
 
                <directory>src/main/resources</directory>
 
                <includes>
 
                    <include>**/**.**</include>
 
                </includes>
 
            </resource>
 
        </resources>
 
    </build>
 
</project>

+ 86 - 18
svr/svr-cloud-job/src/main/resources/application.yml
View File 

@ -61,28 +61,38 @@ spring:
 
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
 
    username: ssgg
 
    password: ssgg@jkzl2019
 
  activemq:
 
    broker-url: tcp://172.26.0.116:61616
 
    user: admin
 
    password: admin
 
  redis:
 
    host: 172.26.0.253 # Redis server host.
 
    port: 6379 # Redis server port.
 
hlwyyEntrance:
 
  url: http://localhost:10023
 
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
 
fastDFS:
 
  fastdfs_file_url: http://172.26.0.110:8888/
 
fast-dfs:
 
  tracker-server: 172.26.0.110:22122 #服务器地址
 
demo:
 
  flag: true
 
hospital:
 
  url: ht
 
  mqUser: 1
 
  mqPwd: 1
 
  url: https://wx.xmzsh.com
 
  mqUser: JKZL
 
  mqPwd: 123456
 
  SourceSysCode: S60
 
  TargetSysCode: S01
 
im:
 
  im_list_get: http://172.26.0.105:3000/
 
  data_base_name: im_internet_hospital
 
fastDFS:
 
  fastdfs_file_url: http://172.26.0.110:8888/
 
wlyy:
 
  url: http://ehr.yihu.com/wlyy/
 
wechat:
 
  appId: wxd03f859efdf0873d
 
  appSecret: 2935b54b53a957d9516c920a544f2537
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: hz_yyyzh_wx  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
@ -101,31 +111,89 @@ spring:
 
    host: 192.0.33.26 # Redis server host.
 
    port: 6390 # Redis server port.
 
    password: Kb6wKDQP1W4
 
fastDFS:
 
  fastdfs_file_url: https://hlwyy.xmzsh.com/fastdfs/
 
fast-dfs:
 
  tracker-server: 192.0.33.26:22122 #服务器地址
 
hlwyyEntrance:
 
  url: http://172.16.1.42:10023
 
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
 
demo:
 
  flag: false
 
  flag: true
 
hospital:
 
  url: https://172.16.1.34
 
  url: https://wx.xmzsh.com
 
  mqUser: JKZL
 
  mqPwd: 123456
 
  SourceSysCode: S60
 
  TargetSysCode: S01
 
im:
 
  im_list_get: http://172.16.1.42:3000/
 
  im_list_get: http://172.26.0.105:3000/
 
  data_base_name: im_internet_hospital
 
fastDFS:
 
  fastdfs_file_url: http://192.0.33.26:8888/
 
wlyy:
 
  url: http://www.xmtyw.cn/wlyytest/
 
  url: 1
 
wechat:
 
  appId: wx2c55f5b7b2f3cb56
 
  appSecret: 0dd9927e58125ad5f0efb9299860d145
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08041
 
  wechat_base_url: http%3A%2F%2Fhzijk.cityihealth.com%2Fcityihealth%2FcloudCare%2F
 
  accId: gh_da06ed9e5751
 
  id: hz_yyyzh_wx  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
  flag: true #演示环境  true走Mysql数据库  false走Oracle
 
cloudServer:
 
  server_url: http://172.26.0.12:10301/
 
pay:
 
  flag: true
 
---
 
spring:
 
  profiles: hzprod
 
  datasource:
 
    driver-class-name: com.mysql.jdbc.Driver
 
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&amp;characterEncoding=utf-8&amp;autoReconnect=true&useSSL=false
 
    username: root
 
    password: '*ukOOSl&c0!y'
 
  #  elasticsearch:
 
  #    cluster-name: jkzl #集群名 默认elasticsearch
 
  #    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
 
  #    client-transport-sniff: false
 
  #    jest:
 
  #      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
 
  #      connection-timeout: 60000 # Connection timeout in milliseconds.
 
  #      multi-threaded: true # Enable connection requests from multiple execution threads.
 
  activemq:
 
    broker-url: tcp://172.26.0.13:61616
 
    user: admin
 
    password: admin
 
  redis:
 
    host: 172.26.0.13 # Redis server host.
 
    port: 6379  # Redis server port.
 
    password: Kb6wKDQP1W4
 
fastDFS:
 
  fastdfs_file_url: http://172.26.0.13:8888/
 
fast-dfs:
 
  tracker-server: 172.26.0.13:22122 #服务器地址
 
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
 
demo:
 
  flag: false
 
hospital:
 
  url: 1
 
  mqUser: 1
 
  mqPwd: 1
 
  SourceSysCode: S60
 
  TargetSysCode: S01
 
im:
 
  im_list_get: http://172.26.0.12:3000/
 
  data_base_name: im_internet_hospital
 
wlyy:
 
  url: 1
 
wechat:
 
  appId: wx2c55f5b7b2f3cb56
 
  appSecret: 0dd9927e58125ad5f0efb9299860d145
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08041
 
  wechat_base_url: http%3A%2F%2Fhzijk.cityihealth.com%2Fcityihealth%2FcloudCare%2F
 
  accId: gh_da06ed9e5751
 
  id: hz_yyyzh_wx  # base库中,wx_wechat 的id字段
 
  flag: true #演示环境  true走Mysql数据库  false走Oracle
 
cloudServer:
 
  server_url: http://172.26.0.12:10301/
 
pay:
 
  flag: true