fix 模块卷

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -130,7 +130,7 @@ certificate:
 
 liveGotoURL: http://120.79.166.78:19014/
 
-enCodeVersion: develop
+enCodeVersion: trial
 
 oldStudySys:
     syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/http/HttpUtils.java

@@ -143,7 +143,6 @@ public class HttpUtils
             post.addHeader("content-type", "application/json");
             HttpResponse res = client.execute(post);
             if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-                System.out.println(res.getEntity().getContent());
                 if (res.getEntity().getContentType().getValue().equalsIgnoreCase("image/jpeg")) {
                     InputStream inputStream = res.getEntity().getContent();
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -965,22 +965,22 @@ public class WxLoginService implements IWxLoginService {
             sceneParam.append("goodsType=").append(goodsVo.getGoodsType()).append("&");
             sceneParam.append("sc=").append(bo.getShareCode());
         }
-        System.out.println(pageUrl);
-        System.out.println(sceneParam.toString());
         obj.put("page", pageUrl);
         obj.put("scene",sceneParam.toString());
         obj.put("env_version",enCodeVersion);
         String result = HttpUtils.sendPost(url, obj);
-        List<String> codes = Arrays.asList("40001", "42001");
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
-            //微信access_token 过期或者失效，刷新access_token
-            String key = "WX_SMALL_ACCESS_TOKEN";
-            redisCache.deleteObject(key);
-            String wxGzhAccessTokenTo = getWxSmallAccessToken();
-            String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
-            String urlTo = small_wxEnCodeUrl + "?" + paramTo;
-            return HttpUtils.sendPost(urlTo, obj);
+        if (result.contains("errcode")){
+            List<String> codes = Arrays.asList("40001", "42001");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
+                //微信access_token 过期或者失效，刷新access_token
+                String key = "WX_SMALL_ACCESS_TOKEN";
+                redisCache.deleteObject(key);
+                String wxGzhAccessTokenTo = getWxSmallAccessToken();
+                String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
+                String urlTo = small_wxEnCodeUrl + "?" + paramTo;
+                return HttpUtils.sendPost(urlTo, obj);
+            }
         }
         return result;
     }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -589,7 +589,7 @@
                                course_menu_exam m
 
                            where
-                               m.type in (1) GROUP BY m.course_id
+                               m.type in (1,3) GROUP BY m.course_id
             ) ge on gc.course_id = ge.course_id
         where 1=1
           and gc.goods_id =#{goodsId}