From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/WxUtil.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/util/WxUtil.java b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
index 49bcfbf..2a5a78c 100644
--- a/flower_city/src/main/java/com/dg/core/util/WxUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
@@ -14,8 +15,13 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -27,6 +33,19 @@
private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+ private static String miniprogramState="trial";//trial 为测试版 formal 为正式版 切记发布版本时候改为正式版
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
+
+ private static WxUtil wxUtil;
+
+ @PostConstruct
+ public void init() {
+ wxUtil = this;
+ wxUtil.stringRedisTemplate = this.stringRedisTemplate;
+ }
+
/**
* 获取花城token，（ps:0=token获取失败）
*
@@ -34,19 +53,20 @@
*/
public String getBatteryCarAccessToken() throws Exception {
String accessToken = "0";
- try {
- // 此处APP_ID APP_SECRET 在微信小程序后端可见
- // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET);
- String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + ConstantPropertiesUtil.WX_OPEN_APP_ID
- + "&secret=" +ConstantPropertiesUtil.WX_OPEN_APP_SECRET;
- String result = httpGet(accessTokenUrl, null, null);
- Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
- if (resultMap.containsKey("access_token")) {
- accessToken = resultMap.get("access_token").toString();
- }
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
+// try {
+// // 此处APP_ID APP_SECRET 在微信小程序后端可见
+// // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET);
+// String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + ConstantPropertiesUtil.WX_OPEN_APP_ID
+// + "&secret=" +ConstantPropertiesUtil.WX_OPEN_APP_SECRET;
+// String result = httpGet(accessTokenUrl, null, null);
+// Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+// if (resultMap.containsKey("access_token")) {
+// accessToken = resultMap.get("access_token").toString();
+// }
+// } catch (IOException ioe) {
+// ioe.printStackTrace();
+// }
+ accessToken =wxUtil.stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
return accessToken;
}
@@ -200,7 +220,8 @@
WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
subscribeDTO.setTouser(openId);
subscribeDTO.setTemplate_id(templateId);
- subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/myApply/myApply");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
Calendar calendar = Calendar.getInstance();
paras.add(new TemplateParam("thing1","导办申请"));//业务办理类型
@@ -229,7 +250,8 @@
WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
subscribeDTO.setTouser(openId);
subscribeDTO.setTemplate_id(templateId);
- subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
paras.add(new TemplateParam("thing4","您有一个新的导办工单需要处理"));//工单新增提示内容
paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
@@ -255,7 +277,8 @@
WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
subscribeDTO.setTouser(openId);
subscribeDTO.setTemplate_id(templateId);
- subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
--
Gitblit v1.7.1