Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/WxServiceImpl.java

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -72,6 +73,7 @@ public class WxServiceImpl implements WxService {
     @Override
     public String getAccessToken() {
         //token有效期为7200s，需要保存起来，先从redis中获取accessToken，没有则请求获取
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         String accessToken = stringRedisTemplate.opsForValue().get(WxConstant.IUAV_MINI_PROGRAM_ACCESS_TOKEN);
         if (StringUtils.isBlank(accessToken)) {
             String getAccessTokenUrl = "https://api.weixin.qq.com/cgi-bin/token" + "?grant_type=client_credential" + "&appid=" +
@@ -84,6 +86,7 @@ public class WxServiceImpl implements WxService {
             accessToken = tokenResult.getString("access_token");
             long expiresIn = tokenResult.getLong("expires_in");
             //保存进redis
+            stringRedisTemplate.setValueSerializer(RedisSerializer.json());
             stringRedisTemplate.opsForValue().set(WxConstant.IUAV_MINI_PROGRAM_ACCESS_TOKEN, accessToken, expiresIn, TimeUnit.SECONDS);
             return accessToken;
         }
@@ -93,6 +96,7 @@ public class WxServiceImpl implements WxService {
     @Override
     public String getStableAccessToken() {
         //token有效期为7200s，需要保存起来，先从redis中获取accessToken，没有则请求获取
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         String accessToken = stringRedisTemplate.opsForValue().get(WxConstant.IUAV_MINI_PROGRAM_STABLE_ACCESS_TOKEN);
         if (StringUtils.isBlank(accessToken)) {
             Map<String, String> params = new HashMap<String, String>();
@@ -113,6 +117,7 @@ public class WxServiceImpl implements WxService {
             accessToken = tokenResult.getString("access_token");
             long expiresIn = tokenResult.getLong("expires_in");
             //保存进redis
+            stringRedisTemplate.setValueSerializer(RedisSerializer.json());
             stringRedisTemplate.opsForValue().set(WxConstant.IUAV_MINI_PROGRAM_STABLE_ACCESS_TOKEN, accessToken, expiresIn, TimeUnit.SECONDS);
             return accessToken;
         }
@@ -122,6 +127,7 @@ public class WxServiceImpl implements WxService {
     @Override
     public String getSubAccessToken() {
         //token有效期为7200s，需要保存起来，先从redis中获取accessToken，没有则请求获取
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         String accessToken = stringRedisTemplate.opsForValue().get(WxConstant.SHARE_FLY_SUB_ACCESS_TOKEN);
         if (StringUtils.isBlank(accessToken)) {
             String getAccessTokenUrl = "https://api.weixin.qq.com/cgi-bin/token" + "?grant_type=client_credential" + "&appid=" +
@@ -135,6 +141,7 @@ public class WxServiceImpl implements WxService {
             accessToken = tokenResult.getString("access_token");
             long expiresIn = tokenResult.getLong("expires_in");
             //保存进redis
+            stringRedisTemplate.setValueSerializer(RedisSerializer.json());
             stringRedisTemplate.opsForValue().set(WxConstant.SHARE_FLY_SUB_ACCESS_TOKEN, accessToken, expiresIn, TimeUnit.SECONDS);
             return accessToken;
         }
@@ -144,6 +151,7 @@ public class WxServiceImpl implements WxService {
     @Override
     public String getSubStableAccessToken() {
         //token有效期为7200s，需要保存起来，先从redis中获取accessToken，没有则请求获取
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         String accessToken = stringRedisTemplate.opsForValue().get(WxConstant.SHARE_FLY_SUB_STABLE_ACCESS_TOKEN);
         if (StringUtils.isBlank(accessToken)) {
             Map<String, String> params = new HashMap<String, String>();
@@ -164,6 +172,7 @@ public class WxServiceImpl implements WxService {
             accessToken = tokenResult.getString("access_token");
             long expiresIn = tokenResult.getLong("expires_in");
             //保存进redis
+            stringRedisTemplate.setValueSerializer(RedisSerializer.json());
             stringRedisTemplate.opsForValue().set(WxConstant.SHARE_FLY_SUB_STABLE_ACCESS_TOKEN, accessToken, expiresIn, TimeUnit.SECONDS);
             return accessToken;
         }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: a7f5f1113aff6dd1891c5220ebb5dcb10f014899
+  newTag: dcab0bb8547a2a772995a18d548fc14032f4ea49