From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +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 | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 41 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 9f56acb..5c23d53 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
@@ -20,6 +20,10 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -53,9 +57,6 @@
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
public static final String REDIS_TOKEN_KEY = "token_";
- public static final String CUSTOMER = "CUSTOMER";
- public static final String BUSINESS = "BUSINESS";
-
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String ZBOM_CRM_AUTH_API_KEY = "ZBOM_CRM_AUTH_API_KEY";
@@ -108,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" ;
@@ -219,7 +221,7 @@
* 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
*/
public static boolean checkCarNo(String str) {
-// String patt="^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹宸濋潚钘忕惣瀹佺Е宸漖\\\\d{5}[A-Z]$";
+// String patt="^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹宸濋潚钘忕惣瀹佺Е宸漖d{5}[A-Z]$";
// Pattern r = Pattern.compile(patt);
// Matcher matcher = r.matcher(str);
// String regex = "^[\u4e00-\u9fa5]{1}[A-Z]{1}[A-HJ-NP-Z]{1}[A-HJ-NP-Z0-9]{4}[D0-9X]$";
@@ -337,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";
@@ -352,6 +355,7 @@
public static final String WX_PLATFORM = "WX_PLATFORM";
public static final String ZBOM_ZHONGTAI_API_URL = "ZBOM_ZHONGTAI_API_URL";
+ public static final String ZBOM_ZHONGTAI_SYS_API_URL = "ZBOM_ZHONGTAI_SYS_API_URL";
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
public static final String ZBOM_ENCODE_URL = "ZBOM_ENCODE_URL";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
@@ -374,6 +378,13 @@
public static final String WX_SECRET_PERSONNEL = "WX_SECRET_PERSONNEL";
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 {
@@ -387,6 +398,9 @@
String ZBOM_ENCODE_URL ="ZBOM_ENCODE_URL";
String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
+ String ZBOM_ZHONGTAI_SYS_API_URL ="ZBOM_ZHONGTAI_SYS_API_URL";
+ String ZBOM_CRM_POSTCUS_API_KEY ="ZBOM_CRM_POSTCUS_API_KEY";
+ String ZBOM_AREA_REDIS_KEY ="ZBOM_AREA_REDIS_KEY";
String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
String IAM_APPKEY ="IAM_APPKEY";
String SHOP_TREE ="SHOP_TREE";
@@ -487,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;
}
@@ -521,6 +535,14 @@
}
return null;
}
+
+ public static String desensitizationPhone(String phone) {
+ if (phone == null || phone.length() != 11) {
+ return phone;
+ }
+ return phone.substring(0, 3) + "****" + phone.substring(7);
+ }
+
public enum VehiclePlateNoEnum {
@@ -574,35 +596,7 @@
}
public static void main(String[] args) {
- System.out.println((DESUtil.decrypt(Constants.EDS_PWD, "En35O2o+Mpw5bThqkT8lmE6UPG+W6LFs")));
-
- Map<String,String> map = new HashMap<>();
- map.put("101","蹇楅偊鏈儴");
- map.put("102","鍒堕�犱簨涓氶儴");
- map.put("103","鑲ヤ笢閿�鍞叕鍙�");
- map.put("104","ZB/蹇楅偊鍘ㄦ煖");
- map.put("105","鍟嗗搧浜嬩笟閮�");
- map.put("106","宸㈡箹閿�鍞叕鍙�");
- map.put("107","IK/鍏ㄥ眿瀹氬埗");
- map.put("108","宸ョ▼浜嬩笟閮�");
- map.put("109","鍚堣偉閿�鍞叕鍙�");
- map.put("110","澶栬锤浜嬩笟閮�");
- map.put("111","蹇楅偊瀹跺眳鍏徃");
- map.put("112","ZB/蹇楅偊琛ｆ煖");
- map.put("127","蹇楅偊鍘ㄦ煖鑲′唤鏈夐檺鍏徃");
- map.put("141","鍚堣偉蹇楅偊鏈ㄤ笟鏈夐檺鍏徃");
- map.put("161","ZB/蹇楅偊鏈ㄩ棬");
- map.put("263","鍥借锤鍏徃");
- List<UnitCodeVo> list = new ArrayList<>();
- Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry<String, String> entry = iterator.next();
- UnitCodeVo m = new UnitCodeVo();
- m.setCode(entry.getKey());
- m.setName(entry.getValue());
- list.add(m);
- }
-System.out.println(JSONObject.toJSONString(list));
+ getImgsFromHtmlText("<p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/40627809-6058-428c-b02a-6715d7b1735a.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/8d9d1737-43c0-4628-a982-ed0832b65464.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/8aacf1bb-5bf0-46dc-bd25-a4f335078711.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/5d5e5af4-fd4e-402f-81d1-e0cc498d55d4.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/4632b61b-0de2-4f73-8b54-f4d6aa3de2db.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/a9eb1a9c-23c7-48aa-9103-cd697158db75.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/a0004771-d606-46fe-b872-07640ee1695a.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/d437bacb-ec87-404e-baa4-a6c040c35216.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/b2c61dc9-fdce-42b1-97d1-12cb993ae8cf.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/e8e27d17-61b0-4035-b229-9ba1c73869eb.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/7f43615d-079e-4133-9e5f-3a1fd19090b8.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/75274ffb-100f-4016-8352-20da9003f192.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/6810dd81-a6bc-4140-bfd7-d9c3e51c2439.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/0dfab735-0a05-47ef-aaa9-728510ad1d2f.jpg\" title=\"\" alt=\"\"/><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240423/ca3b095f-17f2-439b-9cd3-10fe60257dd9.jpg\" title=\"\" alt=\"\"/></p>");
}
@@ -695,8 +689,9 @@
// 鍦烘櫙鐮侊紝涓庡墠绔害瀹氾紝鏈�缁堟槸闇�瑕佸墠绔В鏋�
body.put("scene", scene);
// 姝ｅ紡鐗堜负 "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
- 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();
@@ -708,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) {
@@ -726,6 +721,24 @@
+ public static List<String> getImgsFromHtmlText(String content) {
+ try {
+ if(StringUtils.isNotBlank(content)){
+ List<String> urls = new ArrayList<>();
+ Document doc = Jsoup.parse(content);
+ Elements imgElements = doc.select("img[src]");
+ for (Element imgElement : imgElements) {
+ String imgUrl = imgElement.attr("src");
+ System.out.println(imgUrl);
+ urls.add(imgUrl);
+ }
+ return urls;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return new ArrayList<>();
+ }
--
Gitblit v1.9.3