From 001ab4186873c76ac1e6f97f8e02b6980ac8eb2a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 28 Oct 2020 19:00:22 +0800
Subject: [PATCH] 回退
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java | 33 +++++++++++++++++++++++++++++----
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 4 +++-
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
index 754b5b0..c490b1f 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
@@ -72,7 +72,7 @@
String hospitalID = httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER);
String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER);
String folderByDate = DateUtil.formatDate(new Date());
- int begin = file.getOriginalFilename().indexOf(".");
+ int begin = file.getOriginalFilename().lastIndexOf(".");
int last = file.getOriginalFilename().length();
String fileType = file.getOriginalFilename().substring(begin, last);
String fileName = UUID.randomUUID().toString().replaceAll("-", "") + fileType;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java
index 0b502ac..ba7f14a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java
@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.controller.weixin;
+import cn.hutool.http.HttpUtil;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.utils.QRCodeUtil;
import com.kidgrow.common.utils.StringUtils;
@@ -15,10 +16,8 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -43,6 +42,12 @@
WeiXinOfficPayProperties weiXinOfficPayProperties;
@Autowired
WxService wxService;
+ @Value("${wechat.miniapp.appid}")
+ private String APPID;
+ @Value("${wechat.miniapp.secret}")
+ private String SECRET;
+ @Value("${wechat.apiUrl}")
+ private String APIURL;
/**
* 测试微信的预支付接口
@@ -121,6 +126,26 @@
return callback;
}
+ /**
+ * 公众号或者小程序获取 openid
+ * @param code
+ * @return
+ */
+ @GetMapping("/getOpenId")
+ public ResultBody getOpenId(@RequestParam("code")String code){
+ if (StringUtils.isBlank(code)) {
+ return ResultBody.failed("请输入code");
+ }
+ Map<String,Object> map=new HashMap<>();
+ map.put("appid",APPID);
+ map.put("secret",SECRET);
+ map.put("js_code",code);
+ map.put("grant_type","authorization_code");
+ String s = HttpUtil.get(APIURL + "/sns/jscode2session?", map);
+ return ResultBody.ok().data(s);
+ }
+
+
public static void main(String[] args) throws Exception {
WxController weixinController=new WxController();
Map<String,Object> map=null;
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index c2308e0..ea41ca8 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -233,6 +233,7 @@
- /api-opration/alipay/return
- /api-record/DiagnosticUnfinishedFegin/equipmentList
- /api-record/DiagnosticUnfinishedFegin/equipmentUpload
+ - /api-opration/wxController/getOpenId
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -271,7 +272,8 @@
/api-opration/alipay/return,
/api-opration/alipay/notify,
/api-record/DiagnosticUnfinishedFegin/equipmentList,
- /api-record/DiagnosticUnfinishedFegin/equipmentUpload
+ /api-record/DiagnosticUnfinishedFegin/equipmentUpload,
+ /api-opration/wxController/getOpenId
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
--
Gitblit v1.8.0