forked from gzzfw/backEnd/gz-dyh

xusd
2024-09-17 cbddf31eccd506aa4a0f9062b55800c4e2c1d524
环境配置修正;增加正式环境
15 files modified
103 ■■■■■ changed files
dyh-service/dyh-cust/src/main/resources/config/application-prod.yml 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-cust/src/main/resources/config/application-test.yml 2 ●●● patch | view | raw | blame | history
dyh-service/dyh-disp/src/main/resources/config/application-prod.yml 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-disp/src/main/resources/config/application-test.yml 2 ●●● patch | view | raw | blame | history
dyh-service/dyh-disp/src/main/resources/config/application.yml 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml 13 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/resources/config/application-test.yml 2 ●●● patch | view | raw | blame | history
dyh-service/dyh-sync/src/main/resources/config/application-prod.yml 13 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sync/src/main/resources/config/application-test.yml 2 ●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java 13 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java 6 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/resources/config/application-prod.yml 23 ●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/resources/config/application-test.yml 7 ●●●● patch | view | raw | blame | history
dyh-service/dyh-utils/src/main/resources/config/application-prod.yml 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-utils/src/main/resources/config/application-test.yml 4 ●●●● patch | view | raw | blame | history
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
@@ -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
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
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
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
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
@@ -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