Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -379,6 +379,12 @@
    public static final String WX_TOKEN_CUSTOMER = "WX_TOKEN_CUSTOMER";
    public static final String WX_TOKEN_PERSONNEL = "WX_TOKEN_PERSONNEL";
    public static final String ZBOM_CRM_POSTCUS_API_KEY  = "ZBOM_CRM_POSTCUS_API_KEY";
    public static final String ZBOM_CRM_API_URL_MP = "ZBOM_CRM_API_URL_MP";
    public static final String ZBOM_CRM_API_URL_MP_ADDINTENTION = "ZBOM_CRM_API_URL_MP_ADDINTENTION";
    public static final String ZBOM_CRM_API_URL_PRIVATE_KEY = "ZBOM_CRM_API_URL_PRIVATE_KEY";
    public static final String ZBOM_CRM_API_URL_INIT_VECTOR = "ZBOM_CRM_API_URL_INIT_VECTOR";
    public static final String ZBOM_IAM_CUSTOMER_APPID = "ZBOM_IAM_CUSTOMER_APPID";
    public static final String ZBOM_IAM_BUSINESS_APPID = "ZBOM_IAM_BUSINESS_APPID";


    public interface RedisKeys {
@@ -495,15 +501,15 @@
        StringBuffer stringBuffer = new StringBuffer();
        for (int i = 0; i < arr.length; i++) {
            if(i==0){
                stringBuffer.append( i + "室");
                stringBuffer.append( arr[i] + "室");
            }else if(i==1){
                stringBuffer.append( i + "厅");
                stringBuffer.append( arr[i] + "厅");
            }else if(i==2){
                stringBuffer.append( i + "厨");
                stringBuffer.append( arr[i] + "厨");
            }else if(i==3){
                stringBuffer.append( i + "卫");
                stringBuffer.append( arr[i] + "卫");
            }else if(i==4){
                stringBuffer.append( i + "阳");
                stringBuffer.append( arr[i] + "阳");
            }else {
                break;
            }
@@ -683,11 +689,9 @@
        // 场景码，与前端约定，最终是需要前端解析
        body.put("scene", scene);
        // 正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
        String env_version = "trial";
        String env_version = "release";
        body.put("env_version", env_version);
        if(env_version.equals("release")&&StringUtils.isNotBlank(page)){
            body.put("page", page);
        }
//        body.put("page", "pages/index/index");
        // 透明，根据你的场景自行设置body参数
        body.put("is_hyaline", true);
        OkHttpClient client = new OkHttpClient().newBuilder().build();
@@ -699,7 +703,7 @@
            Response response = client.newCall(request).execute();
            if (response.isSuccessful()) {
                InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
               /*ByteArrayOutputStream baos = new ByteArrayOutputStream();
              /* ByteArrayOutputStream baos = new ByteArrayOutputStream();
                    byte[] buffer = new byte[1024];
                    int len = -1;
                    while ((len = inputStream.read(buffer)) != -1) {