Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/backEnd/gz-dyh

liyj

2024-09-18 024cf8ec81fcc467e61e2507cd303672c67501c9

Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/backEnd/gz-dyh

 dyh-eureka/src/main/resources/config/application-test.yml

@@ -1,6 +1,6 @@
#server配置
server:
  port: 9001
  port: 9011

#spring配置
spring:
@@ -15,7 +15,7 @@
eureka:
  client:
    serviceUrl:
      defaultZone: http://localhost:9001/eureka #集群部署,互相注册
      defaultZone: http://localhost:9011/eureka #集群部署,互相注册
    register-with-eureka: false #是否注册到注册中心 单点部署设置false 集群部署设置true
    fetch-registry: false #是否从注册中心拉取注册服务列表 单点部署设置false 集群部署设置true
  server:

 dyh-gateway/src/main/resources/config/application-test.yml

@@ -16,7 +16,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心

 dyh-service/dyh-cust/src/main/resources/config/application-prod.yml

@@ -10,9 +10,9 @@
    name: dyh-cust
  #数据源配置
  datasource:
    url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_dev
    username: SYSDBA
    password: hugeinfo123
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:

 dyh-service/dyh-cust/src/main/resources/config/application-test.yml

@@ -1,7 +1,7 @@
#server配置
server:
  #端口
  port: 9004
  port: 9014

#Spring配置
spring:
@@ -10,7 +10,7 @@
    name: dyh-cust
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -49,7 +49,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心

 dyh-service/dyh-disp/src/main/resources/config/application-prod.yml

@@ -10,9 +10,9 @@
    name: dyh-disp
  #数据源配置
  datasource:
    url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_dev
    username: SYSDBA
    password: hugeinfo123
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:

 dyh-service/dyh-disp/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-disp
  #数据源配置
  datasource:
    url: jdbc:dm://localhost:9016?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -49,7 +49,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心

 dyh-service/dyh-disp/src/main/resources/config/application.yml

@@ -2,8 +2,8 @@
spring:
  profiles:
    active:
      - dev
#        - test
#      - dev
        - test
  #      - prod

  devtools:

 dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml

@@ -1,7 +1,7 @@
#server配置
server:
  #端口
  port: 9006
  port: 9008

#Spring配置
spring:
@@ -10,9 +10,9 @@
    name: dyh-mediate
  #数据源配置
  datasource:
    url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_dev
    username: SYSDBA
    password: hugeinfo123
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
@@ -28,7 +28,7 @@
  redis:
    host: 183.2.142.21
    port: 9017
    password: SYSDBA
    password: hugeinfo123
    # 使用的Redis数据库索引（默认为0）
    database: 0
    # 连接超时时间（毫秒）
@@ -93,4 +93,7 @@
    servlet:
      context-path: /
    ssl:
      enabled: false
      enabled: false

ai:
  url: http://183.2.142.21:9003

 dyh-service/dyh-mediate/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-mediate
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -49,7 +49,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心

 dyh-service/dyh-sync/dyh-sync.iml

New file
@@ -0,0 +1,224 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
        <sourceRoots>
          <root url="file://$MODULE_DIR$/src/main/java" />
          <root url="file://$MODULE_DIR$/src/main/resources" />
        </sourceRoots>
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="dyh-base" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.12.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk18on:1.73" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk18on:1.73" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk18on:1.73" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.10.18" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.9.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.19" level="project" />
    <orderEntry type="library" name="Maven: io.github.x-stream:mxparser:1.2.2" level="project" />
    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
    <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
    <orderEntry type="library" name="Maven: com.google.inject:guice:4.1.0" level="project" />
    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.10.18" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:6.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:4.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.10" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" />
    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" />
    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.83" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.83" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.32" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.34" level="project" />
    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.13.5" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
    <orderEntry type="library" name="Maven: org.mockito:mockito-core:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.12.23" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.12.23" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.101.Final" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.14" level="project" />
    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.0" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
    <orderEntry type="library" name="Maven: com.dameng:DmJdbcDriver18:8.1.3.140" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.1" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2" level="project" />
    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.5" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: com.github.binarywang:qrcode-utils:1.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
    <orderEntry type="library" name="Maven: com.baidu.aip:java-sdk:4.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.10.8" level="project" />
    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jaxb:txw2:2.3.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.7.18" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.7.18" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.7.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.3" level="project" />
    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.22.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.5.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.31" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.31" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.7.18" level="project" />
    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.15.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.15.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.30" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
  </component>
</module>

 dyh-service/dyh-sync/src/main/resources/config/application-prod.yml

@@ -10,14 +10,19 @@
    name: dyh-sync
  #数据源配置
  datasource:
    url: jdbc:mysql://120.79.193.119:3306/bydyh2.0_v101_prod?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
    username: root
    password: hugeinfo123
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:dm://localhost:9016?schema=gzdyh_dev
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      stat-view-servlet:
        # 关闭 Druid 的统计视图
        enabled: false
      # 定期检查空闲连接的有效性
      test-while-idle: true
      # 用来验证数据库连接是否仍然可用的 SQL 查询
      validation-query: SELECT 1

#注册中心配置
eureka:

 dyh-service/dyh-sync/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-sync
  #数据源配置
  datasource:
    url: jdbc:dm://localhost:9016?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -29,7 +29,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java

@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.HashMap;
@@ -16,7 +17,9 @@
@Slf4j
@Service
public class GridToDoService {
    private String gridUrl = "http://219.137.166.84:8061";
    @Value("${grid.url:http://219.137.166.84:8061}")
    private String gridUrl;


    public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
        HeadVo headVo = initHeadVo();
@@ -24,7 +27,7 @@
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridToDoVo);
        log.info("xsd:{}", JSON.toJSONString(requestVo));
        log.info("xsd:{}",gridUrl + "/sysUserTodo/save");
        log.info("xsd:{}", gridUrl + "/sysUserTodo/save");
        String s = null;
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/save", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
@@ -44,7 +47,7 @@
        requestVo.setBodyVo(gridToDoVo);
        String s = null;
        log.info("xsd:{}", JSON.toJSONString(requestVo));
        log.info("xsd:{}",gridUrl + "/sysUserTodo/update");
        log.info("xsd:{}", gridUrl + "/sysUserTodo/update");
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/update", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
        } catch (Exception e) {
@@ -65,7 +68,7 @@
        log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel");
        String s = null;
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel",  JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
        } catch (Exception e) {
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);
@@ -100,7 +103,7 @@
        log.info("xsd:{}", gridUrl + "/sysUserTodo/page");
        String s = null;
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page",  JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
        } catch (Exception e) {
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java

@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.HashMap;
@@ -14,7 +15,8 @@
@Slf4j
@Service
public class GridUserService {
    private String gridUrl = "http://219.137.166.84:8061";
    @Value("${grid.url:http://219.137.166.84:8061}")
    private String gridUrl;
    private String testUrl = "http://183.2.142.46:9007";

    public R<GridUserVo> getUserInfo(GridTokenVo gridTokenVo) {
@@ -40,7 +42,7 @@
    public HeadVo initHeadVo() {
        HeadVo headVo = new HeadVo();
        headVo.setUsername("mtxt001");
        headVo.setPassword("aek8CdcaM");
        headVo.setPassword("kd*cCoAb");
        headVo.setRequestId(UUID.randomUUID().toString());
        headVo.setSource("string");
        return headVo;

 dyh-service/dyh-sys/src/main/resources/config/application-prod.yml

@@ -10,9 +10,9 @@
    name: dyh-sys
  #数据源配置
  datasource:
    url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_dev
    username: SYSDBA
    password: hugeinfo123
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
@@ -95,9 +95,24 @@
    ssl:
      enabled: false

#科大讯飞配置
#ftp服务配置
ftp:
  #服务器ip地址
  hostname: 192.168.234.34
  #端口
  port: 21
  #用户名
  username: hugeinfo
  #密码
  password: hugeinfo123
  #附件存储根目录
  rootdir: /deploy/ftp/gzdyh

xfyun:
  host_url: https://iat-api.xfyun.cn/v2/iat
  appid: 5c7b00be
  api_secret: MGM5Mjg2ODQzYWZmNGE2YjlhOGZlMTJj
  api_key: 9e0a80ed995daf5b194f06ca336080c1
  api_key: 9e0a80ed995daf5b194f06ca336080c1

grid:
  url: http://119.32.29.158:8061

 dyh-service/dyh-sys/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-sys
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -49,7 +49,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://192.168.234.57:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心
@@ -112,4 +112,7 @@
  host_url: https://iat-api.xfyun.cn/v2/iat
  appid: 5c7b00be
  api_secret: MGM5Mjg2ODQzYWZmNGE2YjlhOGZlMTJj
  api_key: 9e0a80ed995daf5b194f06ca336080c1
  api_key: 9e0a80ed995daf5b194f06ca336080c1

grid:
  url: http://219.137.166.84:8061

 dyh-service/dyh-utils/src/main/resources/config/application-prod.yml

@@ -10,9 +10,9 @@
    name: dyh-utils
  #数据源配置
  datasource:
    url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_dev
    username: SYSDBA
    password: hugeinfo123
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:

 dyh-service/dyh-utils/src/main/resources/config/application-test.yml

@@ -1,7 +1,7 @@
#server配置
server:
  #端口
  port: 9003
  port: 9009

#Spring配置
spring:
@@ -10,7 +10,7 @@
    name: dyh-utils
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -24,7 +24,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://localhost:9011/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心