CZT
2023-09-12 e8a5205acec61a431868c9b083fb62c2f187dd34
提交上海嘉定配置信息
已修改6个文件
125 ■■■■ 文件已修改
src/main/java/com/fzzy/api/service/ApiRemoteService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro.yml 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro5303.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/service/ApiRemoteService.java
@@ -37,4 +37,13 @@
     */
    public ResponseDto pushData(ApiParam param, ApiConfs confs, Object data);
    /**
     * 上传文件,获取文件存储id
     * @param param 参数
     * @param confs 配置,可以为空
     * @param data 推送数据
     * @return
     */
//    public ResponseDto pushFile(ApiParam param, ApiConfs confs, Object data);
}
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -128,6 +128,64 @@
        return pushData(param, null, data);
    }
//    @Override
//    public ResponseDto pushFile(ApiParam param, ApiConfs conf, Object data) {
//
//        String inteId = param.getInteId();
//        String kqdm = param.getKqdm();
//
//        try {
//
//            if (null == conf) {
//                conf = apiCommonService.getConf(kqdm);
//            }
//            //获取TOKEN
//            GD2022AuthToken token = getGD2022AuthToken(conf);
//
//            ApiLog apiLog = new ApiLog();
//            apiLog.setId(ContextUtil.getUUID());
//            apiLog.setInteId(inteId);
//            apiLog.setData(JSON.toJSONString(data));
//            apiLog.setKqdm(kqdm);
//            apiLog.setUploadTime(new Date());
//
//            String wjdz = "";
//            if (Constant.API_CODE_1109.equals(inteId)) {
//                //封装数据,获取文件地址
//                Gd2022Api1109 api1109 = new Gd2022Api1109();
//                BeanUtils.copyProperties(data, api1109);
//                wjdz = api1109.getWjdz();
//            } else if (Constant.API_CODE_1307.equals(inteId)) {
//                //封装数据,获取文件地址
//                Gd2022Api1307 api1307 = new Gd2022Api1307();
//                BeanUtils.copyProperties(data, api1307);
//                wjdz = api1307.getWjdz();
//            } else if (Constant.API_CODE_1308.equals(inteId)) {
//                //封装数据,获取文件地址
//                Gd2022Api1308 api1308 = new Gd2022Api1308();
//                BeanUtils.copyProperties(data, api1308);
//                wjdz = api1308.getWjdz();
//            }
//            if (StringUtils.isEmpty(wjdz)) {
//                ResponseDto responseDto = new ResponseDto(99, "没有获取到文件地址", wjdz);
//                apiLog.setStatus(99);
//                apiLog.setResult("没有获取到文件地址");
//                apiLogRep.save(apiLog);
//                return responseDto;
//            }
//            //先上传文件,获取文件id
//            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(conf.getApiUrl(), token, wjdz);
//            ResponseDto resd = new ResponseDto();
//            resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
//            resd.setBizId((String) responseDto.getData());
//            resd.setMsg(responseDto.getMsg());
//            return resd;
//        } catch (Exception e) {
//            log.error(e.getMessage(), e);
//            return new ResponseDto(99, e.getMessage());
//        }
//    }
    /**
     * 推送财务数据接口
     * @param param
src/main/resources/application-dev.yml
@@ -5,22 +5,23 @@
  datasource:
    #主数据源
    primary:
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8  #大湾区
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #港口新仓
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #关埠老仓
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #直属仓库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8 #西胪-新仓粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #西胪-新凤粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8 #金灶一所粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8 #金灶二所粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #粮油转运站
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8 #河溪粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8 #海门粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #和平粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_bf?useUnicode=true&useSSL=false&characterEncoding=utf-8     #潮阳库
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8     #潮阳库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-港口新仓
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-关埠老仓
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-直属仓库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-西胪-新仓粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-新凤粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-金灶一所粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-金灶二所粮库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-粮油转运站
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-河溪粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-海门粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8  #潮阳-和平粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东台山
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8  #广东韶关
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8   #惠州惠新
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8   #武汉黄陂军粮
@@ -29,7 +30,7 @@
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8  #大湾区
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
##########################  广东惠州惠阳   ##########################
##########################  上海嘉定   ##########################
server:
  port: 8090
  port: 9999
  jetty:
    max-http-post-size: 209715200
  tomcat:
@@ -10,15 +10,15 @@
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: root
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: root
  jpa:
    #主jpa配置
    primary:
@@ -51,7 +51,6 @@
      timeout: 6000
igds:
  default:
    companyId: 5326
    companyId: 5303
  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/
src/main/resources/application-pro5303.yml
@@ -1,6 +1,6 @@
##########################  上海嘉定   ##########################
server:
  port: 8090
  port: 9999
  jetty:
    max-http-post-size: 209715200
  tomcat:
@@ -9,16 +9,16 @@
  datasource:
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: root
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: root
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
    primary:
src/main/resources/application.yml
@@ -1,7 +1,7 @@
##########################  Server   ##########################
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: igds-api
  main: