Merge remote-tracking branch 'origin/master'

k94314517

2024-12-05 0c6d3c66de8c75f82547d51848d4445853d7c4fd

Merge remote-tracking branch 'origin/master'

 server/README.md

@@ -11,3 +11,10 @@


nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10018 -jar /usr/local/jars/dmvisit/openapi.jar >/usr/local/jars/dmvisit/web.log 2>/usr/local/jars/dmvisit/err.log &



重要：
1、关于外网访问限制 ，如果服务器重启了或者网卡重启，进行一下操作：
vim /etc/resolv.conf
nameserver 改成  nameserver 202.102.192.68

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active:
  application:
    name: system_gateway
  # 安全配置

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -395,6 +395,13 @@
        saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
        return result;
    }
    public static String startDoGetStringArtemisJson(String[] pathStr,Map<String,String> body ){
        Map<String, String> path = getPath(pathStr[0]);
        Map<String, String> header = new HashMap<>();
        String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json",  header);
        saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
        return result;
    }
    public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
        Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
        Map<String, String> header = new HashMap<>();
@@ -574,10 +581,13 @@
     *    根据微信公众号信息获取AccessToken
     * @return
     */
    public static String wxAccessToken(String configId,String tagId) {
        String[] wxAccessToken= HKConstants.InterfacePath.wxAccessToken;
        wxAccessToken[0] = HKConstants.InterfacePath.wxAccessToken+"?tagId="+tagId+"&configId"+configId;
        return startDoPostStringArtemis(wxAccessToken,"");
    public static String wxAccessToken(HashMap<String,String> params ) {
//        String[] wxAccessToken= new String[2];
//        String url = HKConstants.InterfacePath.wxAccessToken[0]+"?tagId="+tagId+"&configId="+configId;
//        String t = HKConstants.InterfacePath.wxAccessToken[1];
//        wxAccessToken[0] = url;
//        wxAccessToken[1] = t;
        return startDoGetStringArtemisJson(HKConstants.InterfacePath.wxAccessToken,params);
    }
    /**
     *    根据配置微信公众号编号查询微信公众号信息

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -888,7 +888,10 @@
    public  static  BaseResponse<String>   wxAccessToken(String configId,String tagId){
        log.info("【海康根据微信公众号信息获取AccessToken】================开始====configId:"+configId+" && tagId:"+tagId);
        try {
            String res = HKTools.wxAccessToken(configId,tagId);
            HashMap<String,String> params = new HashMap<>();
            params.put("tagId",tagId);
            params.put("configId",configId);
            String res = HKTools.wxAccessToken(params);
            TypeReference typeReference =
                    new TypeReference<BaseResponse<String>>(){};
            BaseResponse<String>   result = JSONObject.parseObject(res, typeReference.getType());