From fd68c25ee4890f298c4bce1c2e4da97b6a70a402 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 03 十一月 2022 16:28:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 5 ++++-
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 7 +++++--
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java | 24 +++++++++++-------------
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index a31de36..b9607f0 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -96,8 +96,11 @@
}
else
{
- sysUser.setOpenid(huaChengSysUser.getOpenid());
- IUserService.updateConfig(sysUser);
+ if(StringUtils.isEmpty(sysUser.getOpenid()))
+ {
+ sysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.updateConfig(sysUser);
+ }
}
//新增浏览记录
iSysUserRecordService.add(sysUser);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index 8878f09..f76bf1c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import cn.hutool.core.util.StrUtil;
import com.jcraft.jsch.SftpException;
import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
@@ -183,7 +184,9 @@
File file1=new File(uuid+"_compress.jpg");
String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
//上传完压缩图后把原图清理，防止文件服务器资源爆满
- minioUtil.removeMinio(fileName);
+ if (StrUtil.isNotBlank(fileName)){
+ minioUtil.removeMinio(fileName);
+ }
return R.ok(imageUrl);
} catch (Exception e) {
log.error("上传照片失败【{}】", e.getMessage());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
index a49fbec..32c450d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
@@ -31,9 +31,6 @@
@Resource
private StringRedisTemplate stringRedisTemplate;
- @Resource
- private WxMaConfiguration wxMaConfiguration;
-
// 公众号appid
private List<String> appidList = new ArrayList<String>() {
{
@@ -91,11 +88,7 @@
// access_token接口https请求方式: GET
// https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET
- //改从redis中获取
- return stringRedisTemplate.boundValueOps("access_token:access_token:" + appid).get();
-
-
-/* String path = " https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+ String path = " https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
URL url = new URL(path + "&appid=" + appid + "&secret=" + secret);
HttpURLConnection connection = (HttpURLConnection)url.openConnection();
connection.setRequestMethod("GET");
@@ -109,9 +102,11 @@
sb.append(new String(b, 0, len));
}
- // System.out.println(sb.toString());
in.close();
- return sb.toString();*/
+
+
+ return sb.toString();
+
}
/**
@@ -163,9 +158,12 @@
if (!appidList.isEmpty()) {
for (int i = 0; i < appidList.size(); i++) {
String token = officialApi.getToken(appidList.get(i), secretList.get(i));
- log.info("通过appid:" + appidList.get(i) + "获取token返回参数：" + token);
- if (StringUtils.isNotEmpty(token)) {
- tokenList.add(token);
+ JSONObject tokenJson = JSON.parseObject(token);
+ if (StringUtils.isNotEmpty(tokenJson)) {
+ tokenList.add(tokenJson.getString("access_token"));
+ if (StringUtils.isNotEmpty(token)) {
+ tokenList.add(token);
+ }
}
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
index 6158a48..9a8b98e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
@@ -94,7 +94,7 @@
// String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
String fileName = s.append(name).toString();
String contentType = file.getContentType();
- minioClient.putObject(minioProperties.getBucket(), fileName, input, contentType);
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
String url = fileUrl.append(fileName).toString();
return fileName;
--
Gitblit v1.7.1