20210203合并冲突

src/main/java/com/ccsens/opensource/wxconfigurer/web/rest/WxController.java

@@ -111,8 +111,9 @@ public class WxController {
         String ccshopMiniprogramPage = "pages/tabbar/mall/mall?scene=issue_665123784503701504";
         String commonUrl = "https://www.ccsens.com";
         String wikiUrl = "https://www.yuque.com/ccsens";
-//        String htproUrl = "https://test.tall.wiki/ht-dev/zy";
-        String htproUrl = "https://www.tall.wiki/ht-dev/zy";
+
+        String htproUrl = "https://test.tall.wiki/ht-dev/zy";
+        String historyUrl = "https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=MzI4NjI4NTA1Ng==&scene=124#wechat_redirect";
         String mtproUrl = "https://www.tall.wiki/mt/";
         String ygczUrl = "https://test.tall.wiki/pt-dev/zy";
         String competeUrl = "http://test.tall.wiki/compete/";
@@ -144,8 +145,10 @@ public class WxController {
                                 WxGzhMenu.Button.builder().name("wiki").type(WxGzhMenu.ButtonType.VIEW).url(wikiUrl).build(),
 //                                WxGzhMenu.Button.builder().name("PT缺陷管理").type(WxGzhMenu.ButtonType.MINIPROGRAM)
 //                                        .url(commonUrl).appid(miniprogramAppId_mtpro).pagepath(page_mtpro_youxi).build()
-                                WxGzhMenu.Button.builder().name("远程体育比赛").type(WxGzhMenu.ButtonType.VIEW)
-                                        .url(WxGzhUtil.getAuthedUrl(competeUrl, WxGzhAuthType.SNSAPI_USERINFO)).build()
+//                                WxGzhMenu.Button.builder().name("远程体育比赛").type(WxGzhMenu.ButtonType.VIEW)
+//                                        .url(WxGzhUtil.getAuthedUrl(competeUrl, WxGzhAuthType.SNSAPI_USERINFO)).build()
+                                WxGzhMenu.Button.builder().name("往期文章").type(WxGzhMenu.ButtonType.VIEW)
+                                        .url(historyUrl).build()
                         )
                         ).build()
                 )