From 5e43a02128d78e0c9444e04057815b98e066c507 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Thu, 19 Jun 2025 10:18:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=BD=AC=E5=85=AC=E4=BC=97=E5=8F=B7=202=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=203?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=204=E3=80=81=E8=A1=A5=E5=85=85=E5=85=AC=E4=BC=97=E5=8F=B7appid?= =?UTF-8?q?=E5=92=8C=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/massageController/ApiLoginController.java | 9 ++ .../jeecg/modules/apiService/LoginApiService.java | 4 + .../modules/apiService/impl/AmountServiceImpl.java | 9 +- .../apiService/impl/LoginApiServiceImpl.java | 127 ++++++++++++++++++++- .../modules/apiService/impl/OrderServiceImpl.java | 30 +++-- .../apiService/impl/RecommendServiceImpl.java | 6 +- .../modules/apiService/impl/ScoreServiceImpl.java | 9 +- .../modules/apiService/impl/ShopServiceImpl.java | 9 +- .../apiService/impl/UserInfoServiceImpl.java | 9 +- .../modules/apiService/impl/VipServiceImpl.java | 3 +- .../apiService/impl/VouchersServiceImpl.java | 15 ++- .../apiService/impl/WxMiniappPayServiceImpl.java | 3 +- .../src/main/resources/application-dev.yml | 2 + 13 files changed, 200 insertions(+), 35 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ApiLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ApiLoginController.java index 549579f..feb8927 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ApiLoginController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ApiLoginController.java @@ -6,7 +6,9 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiService.LoginApiService; import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.bean.OfficialLoginBean; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -23,6 +25,13 @@ public class ApiLoginController { private LoginApiService loginApiService; /******************************************************************************************************************/ + //微信公众号授权登录 + @ApiOperation(value = "用户/微信公众号授权登录",notes = "用户/微信公众号授权登录") + @PostMapping("/wxLogin") + public Result wxLogin(OfficialLoginBean bean){ + return loginApiService.wxOfficialLogin(bean); + } + //小程序-微信授权登录接口 @ApiOperation(value="小程序-微信授权登录接口", notes="小程序-微信授权登录接口") @GetMapping("/login") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java index 3a52b1f..806d478 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java @@ -2,8 +2,12 @@ package org.jeecg.modules.apiService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.bean.OfficialLoginBean; public interface LoginApiService { + //微信公众号授权登录 + Result wxOfficialLogin(OfficialLoginBean bean); + //小程序-微信授权登录接口 public Result login(LoginReq loginReq); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java index 6bb204a..bf0742f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java @@ -69,7 +69,8 @@ public class AmountServiceImpl implements AmountService { public Result queryCashoutLog(String token, PageBean pageBean) { log.info("获取提现记录列表开始"); //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + ////HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证 //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919297392365035521"); //返回信息 String massege = ""; @@ -108,7 +109,8 @@ public class AmountServiceImpl implements AmountService { @Override public Result cashOut(String token, String userName, BigDecimal transferAmount) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919297392365035521"); //提现结果 @@ -253,7 +255,8 @@ public class AmountServiceImpl implements AmountService { @Override public Result getMoney(String token, String id) { log.info("领取提现金额"); - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ MassageCashoutLog cashoutLog = massageCashoutLogService diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java index 7cdbe88..6aa6166 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java @@ -1,36 +1,47 @@ package org.jeecg.modules.apiService.impl; import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.apiService.LoginApiService; +import org.jeecg.modules.bean.ConvertUtils; import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.bean.OfficialLoginBean; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.transaction.Transactional; import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.Date; import java.util.HashMap; import java.util.Map; +@Slf4j @Service public class LoginApiServiceImpl implements LoginApiService { /******************************************************************************************************************/ - //微信小程序appid(愈然工坊) - private static final String mpAppId = "wx77ba4c7131677a74"; - //微信小程序appSecret(愈然工坊) - private static final String mpAppSecret = "fb915d623f92d455f2e70934f75fb96c"; + //微信小程序的 AppID + @Value("${wx.miniapp.wxAppid}") + private String mpAppId; + //微信小程序的 AppID + @Value("${wx.miniapp.wxSecret}") + private String mpAppSecret; @Resource private RedisUtil redisUtil; @@ -41,7 +52,114 @@ public class LoginApiServiceImpl implements LoginApiService { @Resource private HttpConf httpConf; /******************************************************************************************************************/ + //公众号授权登录 + @Override + public Result wxOfficialLogin(OfficialLoginBean bean){ + LoginReq req = new LoginReq(); + req.setCode(bean.getCode()); + req.setHeadimgurl(bean.getHeadimgurl()); + req.setOpenid(bean.getOpenid()); + req.setNickName(bean.getNickName()); + req.setVid(bean.getVid()); + return officialLogin(req); + } + /** + * 公众号授权登录注册 + * @param loginReq + * @return + */ + @Transactional + public Result officialLogin(LoginReq loginReq){ + Map loginMap = new HashMap<>(); + if (org.apache.commons.lang.StringUtils.isBlank(loginReq.getCode())) { + throw new JeecgBootException("code为空"); + } + String loginUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" +mpAppId + "&secret=" + mpAppSecret + "&code=" + loginReq.getCode() + "&grant_type=authorization_code"; + //使用工具类 + JSONObject json_test = httpConf.getJSONObject(loginUrl); + log.info("{} {} -- {}", mpAppId, mpAppSecret, json_test); + String wxOpenid = json_test.getString("openid"); + String wxUnionId = json_test.getString("unionid"); + String access_token = json_test.getString("access_token"); + if (org.apache.commons.lang.StringUtils.isBlank(wxOpenid)) { + throw new JeecgBootException("未获取到openid"); + } + HanHaiMember member = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getOfficialOpenid,wxOpenid).one(); + if(member!=null){ + //开始获取用户信息 + String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN"; + //使用工具类 + JSONObject json_member = httpConf.getJSONObject(memberUrl); + String nickname = json_member.getString("nickname"); + String headimgurl = json_member.getString("headimgurl"); + try { + nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + member.setNickName(nickname); + member.setHeadImage(headimgurl); + member.setWxUnionid(wxUnionId); + String token = JwtUtil.sign(member.getAccount(), member.getAccount()); + member.setToken(token); + member.setUpdateTime(new Date()); + hanHaiMemberService.updateById(member); + + + // 生成token返回 + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + loginMap.put("token",token); + loginMap.put("userInfo",member); + return Result.OK("登录成功",loginMap); + } + //开始获取用户信息 + String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN"; + //使用工具类 + JSONObject json_member = httpConf.getJSONObject(memberUrl); + String nickname = json_member.getString("nickname"); + String headimgurl = json_member.getString("headimgurl"); + try { + nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + HanHaiMember save = new HanHaiMember(); + save.setAccount(wxOpenid); + save.setVid(loginReq.getVid()); + save.setVtime(new Date()); + save.setNickName(nickname); + save.setHeadImage(headimgurl); + save.setWxUnionid(wxUnionId); + + //销售邀请者标识 + save.setShareId(loginReq.getShareId()); + save.setOfficialOpenid(wxOpenid); + save.setCreateTime(new Date()); + //密码加密 + String salt = ConvertUtils.randomGen(8); + String encrypt = PasswordUtil.encrypt(wxOpenid,"123456" , salt); + save.setPassword(encrypt); + save.setPasswordSalt(salt); + save.setDeleteFlag("N"); + save.setRole("0"); + + // 生成token返回 + String token = JwtUtil.sign(wxOpenid, wxOpenid); + save.setToken(token); + + hanHaiMemberService.save(save); + + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + loginMap.put("token",token); + loginMap.put("userInfo",save); + return Result.OK("登录成功",loginMap); + } + //微信小程序授权登录 @Override public Result login(LoginReq loginReq) { Result result = new Result<>(); @@ -106,6 +224,7 @@ public class LoginApiServiceImpl implements LoginApiService { return result; } + //绑定微信手机号 @Override public Result bindPhone(String phoneCode) { try { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 35ca7de..f2eb1e1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -70,7 +70,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result queryOrderList(String token, MassageOrder massageOrder, PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; //分页信息 @@ -119,7 +120,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result queryOrderById(String token, String id) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; @@ -148,7 +150,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result createOrder(String token, MassageOrder massageOrder, String payType) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //订单信息 @@ -218,7 +221,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result cancelOrder(String token, String orderId){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //查询订单是否存在 @@ -245,7 +249,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result deleteOrder(String token, String orderId){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //查询订单是否存在 @@ -272,7 +277,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result payOrder(String token, String orderId, String payType) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //订单信息 @@ -338,7 +344,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result overOrder(String token, String orderId, String type) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try { @@ -418,7 +425,8 @@ public class OrderServiceImpl implements OrderService { //申请退款 public Result rollbackOrder(String token, String orderId){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //查看订单是否存在 @@ -449,7 +457,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result useVouchersList(String token, String useTime, PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810"); //返回信息 String massege = ""; @@ -505,7 +514,8 @@ public class OrderServiceImpl implements OrderService { @Override public Result overOrderList(String token, String useTime, PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810"); //返回信息 String massege = ""; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java index 0d11d39..d45a529 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java @@ -68,7 +68,8 @@ public class RecommendServiceImpl implements RecommendService { @Override public Result getInviteCode(String token) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //获取版本信息 MassageConfig vsion = massageConfigService.lambdaQuery() @@ -192,7 +193,8 @@ public class RecommendServiceImpl implements RecommendService { @Override public Result queryRecommendUserList(String token, PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; //分页信息 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java index 801f766..0469958 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java @@ -43,7 +43,8 @@ public class ScoreServiceImpl implements ScoreService { @Override public Result queryScoreList(String token, String type, String createTime, PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810"); //返回信息 String massege = ""; @@ -88,7 +89,8 @@ public class ScoreServiceImpl implements ScoreService { @Override public Result sign(String token) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810"); //返回信息 String massege = ""; @@ -154,7 +156,8 @@ public class ScoreServiceImpl implements ScoreService { @Override public Result getContinuDay(String token){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810"); try { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java index c09fbca..c568172 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java @@ -74,7 +74,8 @@ public class ShopServiceImpl implements ShopService { @Override public Result queryShopById(String token, String id) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; @@ -108,7 +109,8 @@ public class ShopServiceImpl implements ShopService { @Override public Result addShop(String token, MassageShop massageShop) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; @@ -151,7 +153,8 @@ public class ShopServiceImpl implements ShopService { @Override public Result updateShop(String token, MassageShop massageShop) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java index 3ff9494..7ace52b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java @@ -42,7 +42,8 @@ public class UserInfoServiceImpl implements UserInfoService { @Override public Result queryUserInfo(String token){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId()); @@ -57,7 +58,8 @@ public class UserInfoServiceImpl implements UserInfoService { @Override public Result updateUserInfo(String token,String nickName,String phone,String headImage){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //用户昵称不能为空 @@ -84,7 +86,8 @@ public class UserInfoServiceImpl implements UserInfoService { @Override public Result getUserCenterData(String token){ //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919297392365035521"); //返回信息 Map map = new HashMap(); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java index 920e16f..aa4c3c7 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java @@ -87,7 +87,8 @@ public class VipServiceImpl implements VipService { @Override public Result addVip(String token, String comoId) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //查询套餐信息 MassageVipCombo combo = massageVipComboService.getById(comoId); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java index 6356a12..52cd908 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java @@ -45,7 +45,8 @@ public class VouchersServiceImpl implements VouchersService { @Override public Result queryVouchersList(String token, MassageVouchersUser massageVouchersUser, PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; @@ -99,7 +100,8 @@ public class VouchersServiceImpl implements VouchersService { @Override public Result queryVouchersById(String token, String userVouchersId) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ MassageVouchersUser vouchersUser = massageVouchersUserService @@ -122,7 +124,8 @@ public class VouchersServiceImpl implements VouchersService { @Override public Result queryFetchVouchersList(String token) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //返回信息 String massege = ""; @@ -175,7 +178,8 @@ public class VouchersServiceImpl implements VouchersService { @Override public Result fetchVouchers(String token, String vouchersId) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //查看优惠券是否存在 @@ -220,7 +224,8 @@ public class VouchersServiceImpl implements VouchersService { @Override public Result useVouchers(String token, String userVouchersId) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; try{ //查询核销店铺信息 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java index 6d7d0d3..c697b0f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java @@ -141,7 +141,8 @@ public class WxMiniappPayServiceImpl implements WxMiniappPayService { @Override public Response refund(String token, String orderId) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919297392365035521"); // 初始化服务 diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 7ea2691..0a92273 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -332,6 +332,8 @@ third-app: ## 微信商户 wx: miniapp: + wxAppid: wxb1c123a63736f789 #微信公众号appid + wxSecret: 497549cd0a6a086e59f02f65f470c69a #微信公众号密钥 appid: wx77ba4c7131677a74 # 微信小程序appid secret: fb915d623f92d455f2e70934f75fb96c # 微信小程序密钥 merchantId: 1712378227 # 商户号