CZT
2023-09-13 bf692b7352dd0bab46fcdb97d8705c55a81cb17d
提交上海嘉定新版接口配置信息
已修改7个文件
63 ■■■■ 文件已修改
src/main/java/com/fzzy/api/utils/RSAUtils.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/order/OrderServer.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro5303.yml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/utils/RSAUtils.java
@@ -36,6 +36,16 @@
    // 2048 bits 的 RSA 密钥对,最大加密明文大小
    private static final int MAX_ENCRYPT_BLOCK = MAX_DECRYPT_BLOCK - RESERVE_BYTES;
    public static void main(String[] args) throws Exception {
        Map<String, Object> map = initKey(1024);
        String privateKeyStr = getPrivateKeyStr(map);
        log.info("-----私钥={}", privateKeyStr);
        String publicKeyStr = getPublicKeyStr(map);
        log.info("-----公钥={}", publicKeyStr);
    }
    // 生成密钥对
    public static Map<String, Object> initKey(int keysize) throws Exception {
        KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
src/main/java/com/fzzy/order/OrderServer.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.fzzy.order.data.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +15,7 @@
 * @author czt
 * @date 2023/8/17
 */
@Slf4j
@Controller
@RequestMapping("service/api")
public class OrderServer {
@@ -30,6 +32,7 @@
    @RequestMapping("/order")
    public OrderResp order(@RequestBody OrderReq<JSONObject> req){
        log.info("接收的指令信息={}", req);
        //判断参数
        if(null == req){
            return new OrderResp(OrderResult.ORDER_CODE_500.getCode(), OrderResult.ORDER_CODE_500.getResult());
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -339,8 +339,9 @@
            }
            //先上传文件,获取文件id
            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
            System.out.println((String) responseDto.getData());
            //设置上传文件id
            api1109.setFileStorageId((String) responseDto.getData());
//            api1109.setFileStorageId((String) responseDto.getData());
            return JSON.toJSONString(api1109);
        }else if (Constant.API_CODE_1111.equals(inteId)) {
            Gd2022Api1111 api1111 = new Gd2022Api1111();
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,10 +11,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.gd2022.GD2022HttpClientUtil;
import com.fzzy.push.gd2022.dto.GD2022AuthToken;
import com.fzzy.push.gd2022.dto.GD2022ResponseDto;
import com.fzzy.push.gd2022.dto.GDFinanceDto;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -23,8 +19,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -116,23 +110,16 @@
            SH2023ReqDto reqData = new SH2023ReqDto();
            reqData.setId(ContextUtil.getUUID());
            //获取身份ID,即行政区划码
            if (null == api1102List || api1102List.isEmpty()) {
                ResponseDto responseDto = new ResponseDto(99, "没有获取到身份ID");
                apiLog.setStatus(99);
                apiLog.setResult("没有获取到身份ID");
                apiLogRep.save(apiLog);
                return responseDto;
            }
            reqData.setUid(api1102List.get(0).getXzqhdm());
            reqData.setUid(conf.getUserName());
            //指令id
            reqData.setOrderid(param.getOrderid());
            //身份签名,对地区行政区划代码_当天日期进行MD5算法签名
            reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
            //身份签名,使用自有RSA私钥进行加密(地区行政区划代码_当天日期)
            reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
            //数据总条数
            List<Object> list = (List<Object>) data;
            reqData.setDatalength(list.size());
            //数据进行SM4加密
            reqData.setData(jsonData);
            //使用区级平台公钥对数据进行RSA加密
            reqData.setData(RSAUtils.encrypt(jsonData, conf.getPublicKey()));
            //摘要,数据主体的MD5值
            reqData.setDigst(MyMD5Util.encrypt(jsonData));
src/main/resources/application-dev.yml
@@ -8,8 +8,7 @@
#      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_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?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   #潮阳-直属仓库
@@ -23,7 +22,7 @@
#      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_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     #武汉黄陂军粮
      username: root
      password: Abc123..
@@ -33,10 +32,10 @@
#      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
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新
      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8  #武汉黄陂军粮
      username: root
      password: Abc123..
src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
##########################  上海嘉定   ##########################
server:
  port: 9999
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat:
@@ -9,13 +9,13 @@
  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
    #次数据源
    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
src/main/resources/application-pro5303.yml
@@ -1,6 +1,6 @@
##########################  上海嘉定   ##########################
server:
  port: 9999
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat:
@@ -53,4 +53,9 @@
  default:
    companyId: 5303
  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/
  img-path: D:/IGDS/FILE/
  # 省平台RSA密钥对信息
  #公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
  # 区级平台RSA密钥对信息
  #公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5tOvvBfAbNstnTjQU6VpcgE1Agy3ifXZovHEEnWEMSW5Z5H21VxHTQo2Jl6qi+NH03gKBR0pjOUuqnTMiv5oyZnNo8KKNmF4p+0dFTcEjQ72hsYrNDXjTIn1xzlzuABzGTeOP5W31VO7YsUlQQLj26bWRiwsojaXh7xiUdIUGywIDAQAB
  #私钥:MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALm06+8F8Bs2y2dONBTpWlyATUCDLeJ9dmi8cQSdYQxJblnkfbVXEdNCjYmXqqL40fTeAoFHSmM5S6qdMyK/mjJmc2jwoo2YXin7R0VNwSNDvaGxis0NeNMifXHOXO4AHMZN44/lbfVU7tixSVBAuPbptZGLCyiNpeHvGJR0hQbLAgMBAAECgYAuispqwFk56NS3kmD5MLbF4h36YiYY0orfmwLUPkE5XBn9C4f579V21gI1Dr7kU2oDbbTBA8X/8jcljnpnZg/VzlVaY1TlnBFN7UQxNrMtIZbt3Tk2TyAKl+kGy/RvMu8y0y8/vVE2hyfXsdbwmGRXLw4o02fziOznwgDHBmU4sQJBAOhyMdIQfPrKCocVJ2fqqEyVqW05klVPxRqHeltXjTe2Nr8/dSxDS4TUH1VK63ZBTWcBNiMS7u7OhpaygYwLFQMCQQDMhkb9qgGDZT2CqGA3yGylRDBfw1d8YfK1qDZuvzEhc+v16aZ5X7hxQgDLgGvArjBGyV5rxq2ZCVCbpNqT3yiZAkEAnq4OKqwM1ZuFck/TldIQUC+++IxbxBdvo7umoKJ1Cfo/B3HHiI7sB+JS/YPml9TehRnDnk/3gljEci2r2DFchwJAIsPgZVX0k+Uto3wDfvfun9kLb/vAb0AnBYHmXsTZERqnTVG+HnuK2pWhlPXrWwFA64dnKWLIN29B6HMJRIF2YQJAC8cUhkAX80EVIAz/9JK+4X8yJk0lUFpi+6meE0hhaABtTXNq4kxv7+2gu5Bs64k9R2ZFdJUKTtbcdH++DNKL9Q==