From 076b2a90d0ddd75e4e27d3813b6143abbca25597 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 17:40:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java | 5 ++
server/zbomyoujia.iml | 1
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java | 2
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java | 3 -
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 1
server/web/web.iml | 1
wechat_staff/pages/webView/index.wxml | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTImageListResponse.java | 18 +++++++++
server/pom.xml | 6 ++
server/service/service.iml | 1
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 56 ++++++++++++---------------
server/admin/admin.iml | 1
server/web/pom.xml | 1
admin/.env.development | 2
16 files changed, 62 insertions(+), 42 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 4cc5086..aa3a833 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,3 +1,3 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-VUE_APP_BASE_API = 'http://192.168.0.135:10028'
+VUE_APP_BASE_API = 'http://localhost:10028'
diff --git a/server/admin/admin.iml b/server/admin/admin.iml
index c22228b..af9b49e 100644
--- a/server/admin/admin.iml
+++ b/server/admin/admin.iml
@@ -239,6 +239,7 @@
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.13.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
diff --git a/server/pom.xml b/server/pom.xml
index b3e7fc4..6710c6c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -220,7 +220,11 @@
<artifactId>aliyun-sdk-oss</artifactId>
<version>${aliyun-oss.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.13.1</version>
+ </dependency>
<!-- aliyun sms SDK -->
<dependency>
<groupId>com.aliyun</groupId>
diff --git a/server/service/service.iml b/server/service/service.iml
index 9e1bb2f..f46bf2b 100644
--- a/server/service/service.iml
+++ b/server/service/service.iml
@@ -238,6 +238,7 @@
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.13.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
index d33ff5b..019c02e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
@@ -312,9 +312,6 @@
}
private void isValidToken(String uuid, String timestamp, String token) {
- if(isDebug){
- return;
- }
if (!StringUtils.equalsIgnoreCase( getToken( uuid, timestamp), token)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝token閿欒~");
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
index 6f09b0e..47917c4 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
@@ -4,14 +4,17 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
* 妗堜緥璇︽儏杩斿洖
*/
@Data
-public class ZTCaseInfoResponse implements Serializable {
+public class ZTCaseInfoResponse extends ZTImageListResponse implements Serializable {
private APISpaceCaseVo[] apiSpaceCaseVos;
+
+ private List<String> imageurlList;
private String caseInfo;
/**
* 鏀惰棌閲�
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTImageListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTImageListResponse.java
new file mode 100644
index 0000000..55dd5ac
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTImageListResponse.java
@@ -0,0 +1,18 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import com.doumee.biz.zbom.model.zhongtai.APISpaceCaseVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 妗堜緥璇︽儏杩斿洖
+ */
+@Data
+public class ZTImageListResponse implements Serializable {
+
+ private List<String> imageurlList;
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java
index 705f5ce..096a983 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java
@@ -10,7 +10,7 @@
* 浜у搧璇︽儏杩斿洖
*/
@Data
-public class ZTProductInfoResponse implements Serializable {
+public class ZTProductInfoResponse extends ZTImageListResponse implements Serializable {
private String author;
/**
* 璇︽儏椤佃疆鎾浘鍒楄〃锛堝瑙嗚鍥撅級
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java
index 3940aa9..926bcff 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java
@@ -10,7 +10,7 @@
* 浜у搧鍜ㄨ璇︽儏杩斿洖
*/
@Data
-public class ZTProductNewsInfoResponse implements Serializable {
+public class ZTProductNewsInfoResponse extends ZTImageListResponse implements Serializable {
private String author;
/**
* 璇︽儏椤佃疆鎾浘鍒楄〃锛堝瑙嗚鍥撅級
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
index 4ba6d46..b2f3a8e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
@@ -11,7 +11,7 @@
* 瀹炴櫙妗堜緥璇︽儏杩斿洖
*/
@Data
-public class ZTRealcaseInfoResponse implements Serializable {
+public class ZTRealcaseInfoResponse extends ZTImageListResponse implements Serializable {
private String caseInfo;
private Integer collectCount;
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 3305881..433d72c 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;
@@ -216,7 +220,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]$";
@@ -525,7 +529,7 @@
}
public static String desensitizationPhone(String phone) {
- return phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
+ return phone.replaceAll("(d{3})d{4}(d{4})", "$1****$2");
}
@@ -581,35 +585,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("content: \"<p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/1973fb5c-58ea-4d51-b05f-87c7cd098d9e.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/04c46631-c42c-4b2f-9c92-df9ddb216f73.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/6dc9d538-d260-4970-8580-c248924e3d3f.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/a2ca4806-8d69-40c5-9a89-36381780369d.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/e9bf2963-5b52-411a-8348-c1259a3bd6d3.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/1872ed8b-35f7-4850-8aed-b3bf63573da6.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/afc39c7d-8c46-4f71-9212-6c8bc797c92c.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/78b11cda-fb5b-4983-aa6c-ed371bcd5dcc.jpg\"/></p><p><img src=\"https://osswebcdn.zbom.com//zbkitchen/20240429/f09b5a64-7d8a-423c-b423-f45d0e08e010.jpg\"/></p><p><br/></p>\"\n");
}
@@ -733,6 +709,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<>();
+ }
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 85495af..177ea97 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -295,6 +295,7 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
+
return response;
}
diff --git a/server/web/pom.xml b/server/web/pom.xml
index d307ffa..372f350 100644
--- a/server/web/pom.xml
+++ b/server/web/pom.xml
@@ -56,7 +56,6 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
</plugin>-->
-
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/server/web/web.iml b/server/web/web.iml
index c22228b..af9b49e 100644
--- a/server/web/web.iml
+++ b/server/web/web.iml
@@ -239,6 +239,7 @@
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.13.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
diff --git a/server/zbomyoujia.iml b/server/zbomyoujia.iml
index 6a48115..d5221f1 100644
--- a/server/zbomyoujia.iml
+++ b/server/zbomyoujia.iml
@@ -227,6 +227,7 @@
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.13.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
diff --git a/wechat_staff/pages/webView/index.wxml b/wechat_staff/pages/webView/index.wxml
index dbf6f9a..3525f65 100644
--- a/wechat_staff/pages/webView/index.wxml
+++ b/wechat_staff/pages/webView/index.wxml
@@ -1,5 +1,5 @@
-<web-view src="{{ link }}">
+<web-view src="http://crmtest.zhibang.com:8000/core/oauth/authorize/jump?timestamp=-470965492&agent_phone_number=18055151023&bindKey=mpAddIntention&sign=f2dcf1e3946df40fa9392011da99772d">
</web-view>
--
Gitblit v1.9.3