修正填写注册码bug

bjyy-core/src/main/resources/dev/jdbc.properties

@@ -1,4 +1,6 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://test.tall.wiki:3306/yanyuan?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://192.168.0.108:3306/yanyuan?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 jdbc.username=root
-jdbc.password=po3OynBO[M3579p6L7)o
+#jdbc.password=Bjyanyuan@123
+#jdbc.password=po3OynBO[M3579p6L7)o
+jdbc.password=Sxifrs123_!@#

bjyy-core/src/main/resources/prod/jdbc.properties

@@ -1,6 +1,6 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/yanyuan?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://192.168.0.108:3306/yanyuan?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 jdbc.username=root
 #jdbc.password=Bjyanyuan@123
 #jdbc.password=po3OynBO[M3579p6L7)o
-jdbc.password=
+jdbc.password=Sxifrs123_!@#

bjyy-core/src/main/resources/prod/redis.properties

@@ -1,5 +1,5 @@
 redis.host=127.0.0.1
 redis.port=6379
 #redis.password=keepAwayFromGithub&CodeSave
-redis.password=areowqr!@43ef
-redis.index=1
+redis.password=
+redis.index=3

bjyy-core/src/main/resources/prod/wechat.properties

@@ -10,5 +10,5 @@ wechat.CallbackDomain=https://www.tall.wiki
 
 filePath=/home/staticrec/
 domain=https://www.tall.wiki/
-logoPath=/home/apache-tomcat-8.5.61/webapps/bjyy-weixin/static/images/logo.jpg
-projectPath=/home/apache-tomcat-8.5.61/webapps/bjyy-weixin/
+logoPath=C:\\Applications\\apache-tomcat-8.5.100\\webapps\\bjyy-weixin\\static\\images\\logo.jpg
+projectPath=C:\\Applications\\apache-tomcat-8.5.100\\webapps\\bjyy-weixin\\

bjyy-core/src/main/resources/test/jdbc.properties

@@ -1,4 +1,6 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/yanyuan?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://192.168.0.108:3306/yanyuan?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 jdbc.username=root
-jdbc.password=
+#jdbc.password=Bjyanyuan@123
+#jdbc.password=po3OynBO[M3579p6L7)o
+jdbc.password=Sxifrs123_!@#

bjyy-weixin/src/main/java/com/wmeimob/bjyy/controller/CoreController.java

@@ -114,16 +114,24 @@ public class CoreController {
 		String openId = SessionUtil.getValue(SessionUtil.SESSION_WX_OPENID);
 		log.info("查找openId：" + openId);
 		User usr = RedisUtil.getObject(RedisUtil.PREFIX_USER_INFO + openId);
-		log.info("查找redis内的用户信息：" + usr);
+		log.info("查找redis内的用户信息111：" + usr);
+		log.info("查找redis内的用户信息222：" + (usr == null));
+		int editUserInformation = 0;
 		if(usr == null){
 			usr = new User();
 			usr.setId(UUIDUtil.generateUUID());
+			usr.setOpenId(openId);
+			usr.setRegisterNo(no);
+			usr.setUpdateAt(new Date());
+			userService.save(usr);
+			editUserInformation = 1;
+			log.info("新增用户信息：" + usr);
+		}else {
+			usr.setRegisterNo(no);
+			usr.setUpdateAt(new Date());
+			editUserInformation = userService.editUserInformation(usr);
+			log.info("修改用户信息：" + editUserInformation);
 		}
-		usr.setRegisterNo(no);
-		usr.setUpdateAt(new Date());
-
-		int editUserInformation = userService.editUserInformation(usr);
-		log.info("修改用户信息：" + editUserInformation);
 		if(editUserInformation>0){
 			//更新redis里的user信息
 			RedisUtil.setValue(RedisUtil.PREFIX_USER_INFO + openId, usr);

bjyy-weixin/src/main/java/com/wmeimob/bjyy/controller/HomeController.java

@@ -2,6 +2,7 @@ package com.wmeimob.bjyy.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,11 +27,13 @@ public class HomeController extends BaseController {
 
 	@Autowired
 	private UserService userService;
+	private Logger log = Logger.getLogger(this.getClass());
 
 	@RequestMapping("/start")
 	public ModelAndView start(HttpServletRequest request) {
 		String code = request.getParameter("code");
 		String backUrl = request.getParameter("backUrl");
+		log.info("start: " + code + "," + backUrl);
 		if (!Strings.isNullOrEmpty(code)) {
 			if (Strings.isNullOrEmpty(backUrl)) {
 				backUrl = request.getContextPath() + "/wx/core/index";
@@ -50,12 +53,19 @@ public class HomeController extends BaseController {
 			WxAuthAccessToken authToken = WECHAT.basic().authAccessToken(code);
 			String openId = authToken.getOpenId();
 			if (!Strings.isNullOrEmpty(openId)) {
+				log.info("start,openId is not null: " + openId);
 				SessionUtil.setSession(SessionUtil.SESSION_WX_OPENID, openId);
 				User user = RedisUtil.getObject(RedisUtil.PREFIX_USER_INFO + openId);
 				if (user == null) {
 					// 用户不存在才获取用户信息
+					log.info("start,user = " + user);
 					user = userService.getUserByOpenId(openId);
 					if (user == null || HttpUtil.isNetFileAvailable(user.getHeadImgurl())) {
+						log.info("start,user,user = " + user);
+
+						//因为修改了服务器，没有配置公众号白名单，这里会报错、
+						//invalid ip 116.204.40.58 ipv6 ::ffff:116.204.40.58, not in whitelist rid: 661
+						//程序走到这里会抛出异常，所以下面的saveWechatUser和RedisUtil.setValue都无法执行。
 						WxUserInfoBase userInfo = WECHAT.user().userInfoBase(openId);
 //						if (userInfo.getSubscribe() != 0 || userInfo.getSubscribeTime() != null) {
 							// 用户已关注
@@ -67,6 +77,7 @@ public class HomeController extends BaseController {
 //						}
 					}
 				}
+				log.info("start,return,user = " + user);
 				RedisUtil.setValue(RedisUtil.PREFIX_USER_INFO + openId, user);
 			}
 			return mv;

bjyy-weixin/src/main/java/com/wmeimob/bjyy/service/impl/UserServiceImpl.java

@@ -36,6 +36,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User saveWeChatUser(WxUserInfoBase userInfo) {
+		log.info("saveWeChatUser: " + userInfo);
 		User user = getUserByOpenId(userInfo.getOpenId());
 		try {
 			Date now = new Date();
@@ -55,9 +56,11 @@ public class UserServiceImpl implements UserService {
 				user.setOpenId(userInfo.getOpenId());
 				user.setStatus(true);
 				userMapper.insertSelective(user);
+				log.info("saveWeChatUser,addNew: " + user);
 			} else {
 				user.setUpdateAt(now);
 				userMapper.updateByPrimaryKeySelective(user);
+				log.info("saveWeChatUser,update: " + user);
 			}
 		} catch (Exception e) {
 			log.error(e);