微信公众号-上线正式环境bugfix

src/main/java/com/caimei365/manager/service/sys/impl/SysUserServiceImpl.java

@@ -33,7 +33,7 @@ public class SysUserServiceImpl implements SysUserService {
     private SystemDao systemDao;
 
     @Resource
-    private BCryptPasswordEncoder passwordEncoder;
+    private BCryptPasswordEncoder bCryptPasswordEncoder;
 
     @Resource
     private RedisService redisService;
@@ -126,7 +126,7 @@ public class SysUserServiceImpl implements SysUserService {
         sysUser.setDelFlag(0);
         if (StringUtils.hasLength(sysUser.getPassword())){
             // 密码加密
-            String encodePassword = passwordEncoder.encode(sysUser.getPassword());
+            String encodePassword = bCryptPasswordEncoder.encode(sysUser.getPassword());
             sysUser.setPassword(encodePassword);
         }
         // 删除原有角色关联
@@ -149,7 +149,7 @@ public class SysUserServiceImpl implements SysUserService {
             SysUser dbUser = systemDao.findByUsername(sysUser.getUsername());
             if (null == dbUser || dbUser.getDelFlag() != 0) {
                 // 密码加密
-                String encodePassword = passwordEncoder.encode(sysUser.getPassword());
+                String encodePassword = bCryptPasswordEncoder.encode(sysUser.getPassword());
                 sysUser.setPassword(encodePassword);
                 // 新增用户
                 systemDao.insertSysUser(sysUser);
@@ -236,11 +236,11 @@ public class SysUserServiceImpl implements SysUserService {
         if (!profile.getPassword().equals(profile.getConfirmPassword())){
             return ResponseJson.error("两次密码输入不一致！", null);
         }
-        if (!passwordEncoder.matches(profile.getOldPassword(), sysUser.getPassword())) {
+        if (!bCryptPasswordEncoder.matches(profile.getOldPassword(), sysUser.getPassword())) {
             return ResponseJson.error("旧密码输入错误！", null);
         }
         // 密码加密
-        String encodePassword = passwordEncoder.encode(profile.getPassword());
+        String encodePassword = bCryptPasswordEncoder.encode(profile.getPassword());
         sysUser.setPassword(encodePassword);
         systemDao.updateSysUser(sysUser);
         return ResponseJson.success();

src/main/java/com/caimei365/manager/service/wechat/impl/WechatMenuServiceImpl.java

@@ -161,7 +161,7 @@ public class WechatMenuServiceImpl implements WechatMenuService {
                 return ResponseJson.error("最多包括3个一级菜单！", null);
             }
         } else {
-            if (count >= 3) {
+            if (count >= 5) {
                 return ResponseJson.error("每个一级菜单最多包含5个二级菜单！", null);
             }
         }

src/main/resources/config/beta/application-beta.yml

@@ -51,7 +51,7 @@ caimei:
 # 微信公众号
 wechat:
   apiUrl: https://api.weixin.qq.com
-  publicUrl: http://mp.weixin.qq.com
+  publicUrl: https://mp.weixin.qq.com
   caimei:
     id: gh_123456
     appid: wx123456

src/main/resources/config/dev/application-dev.yml

@@ -49,7 +49,7 @@ caimei:
 # 微信公众号
 wechat:
   apiUrl: https://api.weixin.qq.com
-  publicUrl: http://mp.weixin.qq.com
+  publicUrl: https://mp.weixin.qq.com
   caimei:
     id: gh_123456
     appid: wx123456

src/main/resources/config/prod/application-prod.yml

@@ -53,7 +53,7 @@ caimei:
 # 微信公众号
 wechat:
   apiUrl: https://api.weixin.qq.com
-  publicUrl: http://mp.weixin.qq.com
+  publicUrl: https://mp.weixin.qq.com
   caimei:
     id: gh_ef75b1b89b74
     appid: wx91c4152b60ca91a3