From e1c870f744821d2ccb822379c2a12fa354d972f2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 四月 2025 14:35:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 8 ++++++++
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ++--
server/src/main/java/com/doumee/core/constants/Constants.java | 2 ++
server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java | 2 ++
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 16 ++++++++--------
server/src/main/resources/application.yml | 2 +-
server/src/main/java/com/doumee/core/utils/qiyeweixin/model/response/QywxBaseResponse.java | 2 ++
server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java | 13 +++++++++++++
8 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 9bcd9b3..b602f4a 100644
--- a/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -51,6 +51,7 @@
public void updateById(SystemDictData systemDictData) {
systemDictDataService.updateById(systemDictData);
}
+
@Override
public String updateQywxToken(){
String corpid = queryByCode(Constants.QYWX,Constants.QYWX_CORPID).getCode();
@@ -61,6 +62,13 @@
dictData.setCode(token);
dictData.setUpdateTime(new Date());
systemDictDataService.updateById(dictData);
+ String ticket = QywxUtil.getJsApiTicket(token);
+ SystemDictData ticketDictData = queryByCode(Constants.QYWX,Constants.QYWX_JS_API_TICKET);
+ if (dictData != null ) {
+ ticketDictData.setCode(ticket);
+ ticketDictData.setUpdateTime(new Date());
+ systemDictDataService.updateById(ticketDictData);
+ }
}
return token;
}
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index 5dbbe8b..614f28e 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -23,6 +23,8 @@
public static final String QYWX_SECRET = "QYWX_SECRET";
public static final String QYWX_TOKEN = "QYWX_TOKEN";
public static final String QYWX_AGENTID = "QYWX_AGENTID";
+ public static final String QYWX_JS_API_TICKET = "QYWX_JS_API_TICKET";
+
public static final String QYWX = "QYWX";
public static final Integer ONE = 1;
diff --git a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java
index 99bfe89..bd53fd9 100644
--- a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java
+++ b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java
@@ -24,5 +24,7 @@
//鍙戦�佸簲鐢ㄦ秷鎭�,access_token=璋冪敤鎺ュ彛鍑瘉 POST璇锋眰锛�
public final static String[] SEND_MSG =new String[]{ "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${accesstoken}","鍙戠敓鎺ㄩ�佹秷鎭�"};
public final static String[] GET_USER_BY_AUTH_CODE =new String[]{ "https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token=${accesstoken}&code=${code}","鑾峰彇鐢ㄦ埛鐧诲綍韬唤"};
+ public final static String[] GET_JSAPI_TICKET =new String[]{ "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=${accesstoken}","鑾峰彇浼佷笟 jsapi_ticket"};
+
}
diff --git a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
index 741dcb5..95c7b95 100644
--- a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
+++ b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
@@ -130,6 +130,19 @@
return null;
}
+
+ public static String getJsApiTicket(String token) {
+ String[] interfaceUrl = QywxConstant.GET_JSAPI_TICKET;
+ String url = interfaceUrl[0].replace("${accesstoken}",token);
+ QywxBaseResponse<String> response = sendHttpRequest(url,interfaceUrl[1],""
+ ,new TypeReference<QywxBaseResponse<String>>(){});
+ if(response.getErrcode()!=null && response.getErrcode() ==0){
+ return response.getJsapi_ticket();
+ }
+ return null;
+ }
+
+
/**
* 鍙戣捣wms鎺ュ彛璇锋眰
* @param url
diff --git a/server/src/main/java/com/doumee/core/utils/qiyeweixin/model/response/QywxBaseResponse.java b/server/src/main/java/com/doumee/core/utils/qiyeweixin/model/response/QywxBaseResponse.java
index 2d04dec..161e48f 100644
--- a/server/src/main/java/com/doumee/core/utils/qiyeweixin/model/response/QywxBaseResponse.java
+++ b/server/src/main/java/com/doumee/core/utils/qiyeweixin/model/response/QywxBaseResponse.java
@@ -25,6 +25,8 @@
private String errmsg;
@ApiModelProperty(value = "鑾峰彇鍒扮殑鍑瘉锛屾渶闀夸负512瀛楄妭")
private String access_token;
+ @ApiModelProperty(value = "鑾峰彇鍒扮殑鍑瘉锛屾渶闀夸负512瀛楄妭")
+ private String jsapi_ticket;
@ApiModelProperty(value = "鍑瘉鐨勬湁鏁堟椂闂�")
private Long expires_in;
diff --git a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 7132d8a..470513d 100644
--- a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -435,7 +435,7 @@
if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
+ if(!Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
}
if(Objects.isNull(qwIdBaseResponse.getData())){
@@ -450,7 +450,7 @@
if(Objects.isNull(qywxUserInfoResponse)||Objects.isNull(qywxUserInfoResponse.getErrcode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鑾峰彇鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if(Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
+ if(!Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛�"+qwIdBaseResponse.getErrmsg());
}
member = new Member();
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 405711d..1bf36db 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -168,19 +168,19 @@
message = Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)?"鍚屼簨":"渚涘簲鍟�";
}
message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + categoryName;
- textCard.setDescription("<div class=\"normal\"></div> <div class=\"normal\">"+message+"</div>");
+ textCard.setDescription("<div class=\"normal\">"+message+"</div>");
}else{
textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"銆怐CA涓婃姤銆�":"銆愯穼缁婃粦椋庨櫓涓婃姤銆�");
if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
- message = message + " <div class=\"normal\"></div> <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":"浠诲姟宸插鐞�")) +"</div>";
- message = message + " <div class=\"normal\"></div> <div class=\"normal\">"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") +"/"+ workorder.getLocationName() +"/"+ categoryName+"</div>";
+ message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":"浠诲姟宸插鐞�")) +"</div>";
+ message = message + " <div class=\"normal\">"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") +"/"+ workorder.getLocationName() +"/"+ categoryName+"</div>";
}else{
- message = message + " <div class=\"normal\"></div> <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":((Constants.equalsInteger(contentType,Constants.TWO)?"鎶勯�佺粰浣�":"宸插鐞嗕竴椤�")))) +"</div>";
- message = message + " <div class=\"normal\"></div> <div class=\"normal\">瑙傚療涓婚"+ categoryName +"</div>";
- message = message + " <div class=\"normal\"></div> <div class=\"normal\">绗﹀悎锛�"+ workorder.getDcaYesNum() +" 涓嶇鍚堬細"+workorder.getDcaNoNum()+"</div>";
+ message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":((Constants.equalsInteger(contentType,Constants.TWO)?"鎶勯�佺粰浣�":"宸插鐞嗕竴椤�")))) +"</div>";
+ message = message + " <div class=\"normal\">瑙傚療涓婚"+ categoryName +"</div>";
+ message = message + " <div class=\"normal\">绗﹀悎锛�"+ workorder.getDcaYesNum() +" 涓嶇鍚堬細"+workorder.getDcaNoNum()+"</div>";
if(Constants.equalsInteger(contentType,Constants.TWO)){
- message = message + " <div class=\"normal\"></div> <div class=\"normal\">璇存槑锛�"+ csInfo +"</div>";
+ message = message + " <div class=\"normal\">璇存槑锛�"+ csInfo +"</div>";
}
}
textCard.setDescription(message);
@@ -213,8 +213,8 @@
multifile.setObjId(workorder.getId());
multifile.setCreateDate(new Date());
multifile.setObjType(Constants.multiFileType.upload);
+ multifileMapper.insert(multifile);
}
- multifileMapper.insert(multifileList);
}
}
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 31be178..73dc196 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,7 @@
spring:
profiles:
- active: dev
+ active: test
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3