From eb6157c48f5f3528ef322d86a3232bad2847750a Mon Sep 17 00:00:00 2001 From: zeekling Date: Thu, 8 Oct 2020 21:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E8=81=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 32 ++++++++++++++ .project | 23 ++++++++++ .settings/org.eclipse.core.resources.prefs | 5 +++ .settings/org.eclipse.jdt.core.prefs | 8 ++++ .settings/org.eclipse.m2e.core.prefs | 4 ++ make.sh | 2 +- pom.xml | 2 +- .../wechat/controller/WeXinController.java | 11 ++++- .../wechat/service/WeChatMenuServiceImpl.java | 9 +--- .../zeekling/solo/wechat/util/FileUtils.java | 3 +- src/main/resources/application-dev.properties | 3 +- src/main/resources/menu.json | 43 ++++++------------- 12 files changed, 102 insertions(+), 43 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..a5d9509 --- /dev/null +++ b/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..904a83f --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + blog-weixin + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..839d647 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2f5cc74 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/make.sh b/make.sh index 866debe..881d69b 100755 --- a/make.sh +++ b/make.sh @@ -2,5 +2,5 @@ # 项目编译启动脚本 mvn clean -mvn install -Dmaven.test.skip=true +mvn install -e -Dmaven.test.skip=true diff --git a/pom.xml b/pom.xml index c4bd1f7..7873139 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.zeekling - solo-weixin + blog-weixin 1.0-SNAPSHOT jar diff --git a/src/main/java/com/zeekling/solo/wechat/controller/WeXinController.java b/src/main/java/com/zeekling/solo/wechat/controller/WeXinController.java index b3ce024..23cb0dd 100644 --- a/src/main/java/com/zeekling/solo/wechat/controller/WeXinController.java +++ b/src/main/java/com/zeekling/solo/wechat/controller/WeXinController.java @@ -4,12 +4,12 @@ import com.zeekling.solo.wechat.conf.WeChatConfigure; import com.zeekling.solo.wechat.entity.Validate; import com.zeekling.solo.wechat.service.WeChatMenuService; import com.zeekling.solo.wechat.verify.SHA1; -import me.chanjar.weixin.mp.api.WxMpService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.PostConstruct; import javax.annotation.Resource; /** @@ -21,13 +21,20 @@ import javax.annotation.Resource; @RestController public class WeXinController { - private Logger logger = LoggerFactory.getLogger(getClass()); + private static Logger logger = LoggerFactory.getLogger(WeXinController.class); @Resource private WeChatConfigure weChatConfigure; @Resource private WeChatMenuService weChatMenuService; + + @PostConstruct + public void init() { + logger.info("开始初始化菜单"); + this.createMenu(); + logger.info("初始化菜单成功"); + } @RequestMapping(value = "/validate") public String validate(Validate validate) { diff --git a/src/main/java/com/zeekling/solo/wechat/service/WeChatMenuServiceImpl.java b/src/main/java/com/zeekling/solo/wechat/service/WeChatMenuServiceImpl.java index c892af0..95837d9 100644 --- a/src/main/java/com/zeekling/solo/wechat/service/WeChatMenuServiceImpl.java +++ b/src/main/java/com/zeekling/solo/wechat/service/WeChatMenuServiceImpl.java @@ -2,8 +2,6 @@ package com.zeekling.solo.wechat.service; import com.zeekling.solo.wechat.conf.WeChatConfigure; import com.zeekling.solo.wechat.util.FileUtils; -import me.chanjar.weixin.common.bean.menu.WxMenu; -import me.chanjar.weixin.common.bean.menu.WxMenuButton; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import org.json.JSONArray; @@ -12,12 +10,8 @@ import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - import javax.annotation.PostConstruct; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; /** @@ -55,7 +49,8 @@ public class WeChatMenuServiceImpl implements WeChatMenuService { JSONArray buttonArray = menuInfo.getJSONArray("button"); if (buttonArray == null || buttonArray.length() == 0){ return "{}"; - } + } + System.out.println(menuInfo); return this.wxMpService.getMenuService().menuCreate(menuInfo.toString()); } catch (JSONException | WxErrorException e) { LOG.warn("error in create menu, error:{}", e); diff --git a/src/main/java/com/zeekling/solo/wechat/util/FileUtils.java b/src/main/java/com/zeekling/solo/wechat/util/FileUtils.java index c358763..721cefb 100644 --- a/src/main/java/com/zeekling/solo/wechat/util/FileUtils.java +++ b/src/main/java/com/zeekling/solo/wechat/util/FileUtils.java @@ -27,7 +27,8 @@ public final class FileUtils { * @param filePath 文件地址 * @return 文件内容 */ - public static String readFile(String filePath) { + @SuppressWarnings("resource") + public static String readFile(String filePath) { StrBuilder sb = new StrBuilder(); byte[] buffer = new byte[1024]; try { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index cf35830..35996bd 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,10 +1,9 @@ server.port=9090 logging.file=/home/zeek/project/solo-weixin/logs/weixin.log -# 公众号配置(必填) wx.mp.appId=wxa1de154d148ffc9e wx.mp.secret=3b988f265ea9d5056657b5f5fc3ad566 wx.mp.token=zeekling wx.mp.aesKey=MhHpsysI44QIZkEPTiIvTf96XbEJY3QAGUHyxF1Vp9W -menu.file_path = /home/zeek/project/solo-weixin/src/main/resources/menu.json \ No newline at end of file +menu.file_path = /home/zeek/project/blog-weixin/src/main/resources/menu.json \ No newline at end of file diff --git a/src/main/resources/menu.json b/src/main/resources/menu.json index 0e21c11..c2442e9 100644 --- a/src/main/resources/menu.json +++ b/src/main/resources/menu.json @@ -10,14 +10,23 @@ }, { "type":"view", - "name":"搜索", - "url":"https://www.zeekling.cn/search" + "name":"机器学习算法", + "url":"https://www.zeekling.cn/category/ml" }, - { "type":"view", - "name":"登录", - "url":"https://www.zeekling.cn/start" + "name":"读书+追剧", + "url":"https://www.zeekling.cn/category/read" + }, + { + "type":"view", + "name":"大数据", + "url":"https://www.zeekling.cn/category/big_data" + }, + { + "type":"view", + "name":"搜索", + "url":"https://www.zeekling.cn/search" } ] @@ -30,30 +39,6 @@ "url":"https://git.zeekling.cn/zeekling" } ] - },{ - "name":"私人图床", - "sub_button":[ - { - "name":"二次元", - "type":"view", - "url":"https://img.zeekling.cn/album/18g" - }, - { - "name":"厦门", - "type":"view", - "url":"https://img.zeekling.cn/album/kt6" - }, - { - "name":"我的图片", - "type":"view", - "url":"https://img.zeekling.cn/album/bCG" - }, - { - "name":"壁纸", - "type":"view", - "url":"https://img.zeekling.cn/album/p7Z" - } - ] } ] } \ No newline at end of file