From 9a9af13c74e98dfdb61afd9cbe56b1b7ec8c3414 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 15 八月 2024 18:23:58 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia --- server/service/src/main/java/com/doumee/core/utils/Constants.java | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java index 3b2fa96..babd1ad 100644 --- a/server/service/src/main/java/com/doumee/core/utils/Constants.java +++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java @@ -109,6 +109,7 @@ public static final String ZBOM = "ZBOM" ; public static final String ZBOM_IAM_APPKEY = "ZBOM_IAM_APPKEY"; public static final String ZBOM_IAM_APPID = "ZBOM_IAM_APPID"; + public static final String ZBOM_PAD_INTERFACE_KEY = "ZBOM_PAD_INTERFACE_KEY"; public static final String USER_CARD_HEADER_IMG ="USER_CARD_HEADER_IMG" ; public static final String USER_CARD_PHONE_IMG ="USER_CARD_PHONE_IMG" ; public static final String USER_CARD_ADDR_IMG ="USER_CARD_ADDR_IMG" ; @@ -338,6 +339,7 @@ public static final String SHARES_FILE = "SHARES_FILE"; public static final String NEWS_FILE = "NEWS_FILE"; public static final String USER_LABEL = "USER_LABEL"; + public static final String USERS_MANAGE_CODE = "USERS_MANAGE_CODE"; //鍙戦�佷細璁紑濮� 瀹氭椂鎻愬墠澶氬皯鍒嗛挓鍙戦�� public static final String SYSTEM ="SYSTEM"; @@ -493,15 +495,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; } @@ -529,7 +531,10 @@ } public static String desensitizationPhone(String phone) { - return phone.replaceAll("(d{3})d{4}(d{4})", "$1****$2"); + if (phone == null || phone.length() != 11) { + return phone; + } + return phone.substring(0, 3) + "****" + phone.substring(7); } @@ -678,8 +683,9 @@ // 鍦烘櫙鐮侊紝涓庡墠绔害瀹氾紝鏈�缁堟槸闇�瑕佸墠绔В鏋� body.put("scene", scene); // 姝e紡鐗堜负 "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝e紡鐗堛�� - body.put("env_version", "develop"); - body.put("page", page); + String env_version = "release"; + body.put("env_version", env_version); +// body.put("page", "pages/index/index"); // 閫忔槑锛屾牴鎹綘鐨勫満鏅嚜琛岃缃産ody鍙傛暟 body.put("is_hyaline", true); OkHttpClient client = new OkHttpClient().newBuilder().build(); @@ -691,7 +697,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) { -- Gitblit v1.9.3