From 1c7d77e9a5f6f286b7049aab54aaf8e106daf431 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:38:02 +0800
Subject: [PATCH] 提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 6 +-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 43 --------------
server/service/src/main/java/com/doumee/service/system/SystemDictService.java | 1
server/service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java | 1
server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 31 ++++++++++
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 16 -----
server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java | 36 ++++++++++++
server/service/src/main/java/com/doumee/service/business/MemberService.java | 5 -
server/service/src/main/java/com/doumee/service/business/UsersService.java | 4 -
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 22 +------
server/service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java | 6 ++
11 files changed, 83 insertions(+), 88 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java b/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java
new file mode 100644
index 0000000..f4a34e1
--- /dev/null
+++ b/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java
@@ -0,0 +1,36 @@
+package com.doumee.timer;
+
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.zbom.ZbomIAMService;
+import com.doumee.service.business.MemberService;
+import com.doumee.service.system.SystemDictService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author 鍏紬鍙�:鐭ヤ簡涓�绗�
+ * @since 2023-07-26 11:44
+ */
+@Component("weixinTokenJob")
+public class WeixinTokenJobBiz implements JobService {
+ private static final Logger log = LoggerFactory.getLogger(WeixinTokenJobBiz.class);
+
+ @Autowired
+ SystemDictDataBiz systemDictService;
+ @Override
+ public void run(String params,String module) {
+ Method method = null;
+ try {
+ systemDictService.updWxMiniToken();
+ log.info("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細weixinTokenJob.========"+module);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java b/server/service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
index 6e2299e..5938cf9 100644
--- a/server/service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
+++ b/server/service/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
@@ -37,4 +37,5 @@
String getPreFixPath(String resourceCode, String targetCode);
+ void updWxMiniToken();
}
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 0e7c910..20de185 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -7,6 +7,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.vo.UnitCodeVo;
import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.model.SystemDictData;
@@ -182,6 +183,36 @@
String targetPath = list.stream().filter(s -> s.getLabel().equals(targetCode)).findFirst().map(s -> s.getCode()).orElse("");
return resourcePath+targetPath;
}
+ @Override
+ public void updWxMiniToken() {
+ updWxMiniTokenDo(Constants.WX_APPID_CUSTOMER,Constants.WX_SECRET_CUSTOMER,Constants.WX_TOKEN_CUSTOMER);
+ updWxMiniTokenDo(Constants.WX_APPID_PERSONNEL,Constants.WX_SECRET_PERSONNEL,Constants.WX_TOKEN_PERSONNEL);
+
+ }
+ public void updWxMiniTokenDo(String appID,String appKey,String token) {
+ String appId = queryByCode(Constants.WX_MINI_CONFIG,appID).getCode();
+ String appSecret = queryByCode(Constants.WX_MINI_CONFIG,appKey).getCode();
+ //鐢熸垚寰俊token
+ String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
+ String response = HttpsUtil.sendGet(url);
+ JSONObject json = JSONObject.parseObject(response);
+ SystemDictData systemDictData = queryByCode(Constants.WX_MINI_CONFIG,token);
+ systemDictData.setCode(json.getString("access_token"));
+ systemDictData.setUpdateTime(new Date());
+ updateByIdNew(systemDictData);
+
+ appId = queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_PERSONNEL).getCode();
+ appSecret = queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_PERSONNEL).getCode();
+ //鐢熸垚寰俊token
+ url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
+ response = HttpsUtil.sendGet(url);
+ json = JSONObject.parseObject(response);
+ systemDictData = queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_TOKEN_PERSONNEL);
+ systemDictData.setCode(json.getString("access_token"));
+ systemDictData.setUpdateTime(new Date());
+ updateByIdNew(systemDictData);
+
+ }
}
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 0498054..6a4960e 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
@@ -722,48 +722,7 @@
}
- /**
- * 鍙戦�乬et璇锋眰
- * @param url 璇锋眰URL
- * @param param 璇锋眰鍙傛暟 key:value url鎼哄甫鍙傛暟 鎴栬�呮棤鍙傚彲涓嶅～
- * @return
- */
- public static String doGet(String url, Map<String, String> param) {
- // 鍒涘缓Httpclient瀵硅薄
- CloseableHttpClient httpclient = HttpClients.createDefault();
- String resultString = "";
- CloseableHttpResponse response = null;
- try {
- // 鍒涘缓uri
- URIBuilder builder = new URIBuilder(url);
- if (param != null) {
- for (String key : param.keySet()) {
- builder.addParameter(key, param.get(key));
- }
- }
- URI uri = builder.build();
- // 鍒涘缓http GET璇锋眰
- HttpGet httpGet = new HttpGet(uri);
- // 鎵ц璇锋眰
- response = httpclient.execute(httpGet);
- // 鍒ゆ柇杩斿洖鐘舵�佹槸鍚︿负200
- if (response.getStatusLine().getStatusCode() == 200) {
- resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if (response != null) {
- response.close();
- }
- httpclient.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return resultString;
- }
+
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index 2f77677..d681c89 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -136,9 +136,4 @@
*/
void logOff(Long memberId);
-
- /**
- * 鏇存柊瀹㈡埛绔皬绋嬪簭Token
- */
- void updWxMiniToken();
}
diff --git a/server/service/src/main/java/com/doumee/service/business/UsersService.java b/server/service/src/main/java/com/doumee/service/business/UsersService.java
index d7c18ba..66228f0 100644
--- a/server/service/src/main/java/com/doumee/service/business/UsersService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UsersService.java
@@ -115,10 +115,6 @@
void editUserInfo(EditUsersRequest editUsersRequest);
- /**
- * 鏇存柊鍛樺伐绔皬绋嬪簭Token
- */
- void updWxMiniToken();
String getContentShareImg(Users loginUserInfo, ContentShareImgDto param);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 70150df..9caf811 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -17,10 +17,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.oss.FileModel;
-import com.doumee.core.utils.CodeVerifyUtils;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.MemberMapper;
@@ -40,6 +37,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hikvision.artemis.sdk.util.HttpUtils;
import me.chanjar.weixin.common.error.WxErrorException;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -57,6 +55,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.*;
+import java.util.Date;
import java.util.concurrent.TimeUnit;
/**
@@ -532,20 +531,5 @@
- @Override
- public void updWxMiniToken(){
- DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
- ThreadContext.bind(manager);
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- String appSecret = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_CUSTOMER).getCode();
- //鐢熸垚寰俊token
- String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
- String response = Constants.doGet(url,null);
- JSONObject json = JSONObject.parseObject(response);
- SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_TOKEN_CUSTOMER);
- systemDictData.setCode(json.getString("access_token"));
- systemDictData.setUpdateTime(new Date());
- systemDictDataBiz.updateByIdNew(systemDictData);
- }
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 0eb8606..712ddd5 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -744,21 +744,7 @@
- @Override
- public void updWxMiniToken(){
- DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
- ThreadContext.bind(manager);
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_PERSONNEL).getCode();
- String appSecret = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_PERSONNEL).getCode();
- //鐢熸垚寰俊token
- String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
- String response = Constants.doGet(url,null);
- JSONObject json = JSONObject.parseObject(response);
- SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_TOKEN_PERSONNEL);
- systemDictData.setCode(json.getString("access_token"));
- systemDictData.setUpdateTime(new Date());
- systemDictDataBiz.updateByIdNew(systemDictData);
- }
+
}
diff --git a/server/service/src/main/java/com/doumee/service/system/SystemDictService.java b/server/service/src/main/java/com/doumee/service/system/SystemDictService.java
index 074b1e1..cb60ca6 100644
--- a/server/service/src/main/java/com/doumee/service/system/SystemDictService.java
+++ b/server/service/src/main/java/com/doumee/service/system/SystemDictService.java
@@ -84,4 +84,5 @@
* @date 2023/03/21 14:49
*/
long count(SystemDict systemDict);
+
}
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
index 4d6e880..b2b5789 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
@@ -1,5 +1,9 @@
package com.doumee.service.system.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.system.model.SystemDictData;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.doumee.core.model.PageData;
@@ -16,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
@@ -94,4 +99,5 @@
Wrapper<SystemDict> wrapper = new QueryWrapper<>(systemDict);
return systemDictMapper.selectCount(wrapper);
}
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index 747d3b4..dc15110 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -66,6 +66,8 @@
@Autowired
private CustomerUserService customerUserService;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@@ -247,13 +249,11 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse testToken () {
- memberService.updWxMiniToken();
+ systemDictDataBiz.updWxMiniToken();
return ApiResponse.success("鏇存柊鎴愬姛");
}
- @Autowired
- private SystemDictDataBiz systemDictDataBiz;
@LoginRequired
@ApiOperation(value = "鑾峰彇鍒嗕韩灏忕▼搴忎簩缁寸爜锛堝浘鐗囨祦锛宨mg鏍囩src鎸囧畾锛�", notes = "瀹㈡埛绔皬绋嬪簭")
--
Gitblit v1.9.3