Pu Zhibing
2024-12-17 1980a470b8fbad103cef1c1d8f57de547e51773c
提交基础版本
5个文件已修改
64 ■■■■ 已修改文件
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserAHTravel/guns-admin/src/main/resources/application.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java
@@ -49,7 +49,7 @@
                    baseWarpper.setId(2);
                    break;
                case 3:
                    baseWarpper.setName("定制班线");
                    baseWarpper.setName("城际拼车");
                    baseWarpper.setId(3);
                    break;
                case 4:
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -215,7 +215,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfo.setAvatar("https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            //用户所属企业
            if(null != registAreaCode){
@@ -284,7 +284,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfo.setAvatar("https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            this.insert(userInfo);
@@ -402,7 +402,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfo.setAvatar("https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            //用户所属企业
            if(null != registAreaCode){
@@ -1272,7 +1272,7 @@
     */
    public String getDefaultName(){
        int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
        return "HQ" + String.valueOf(num).substring(1);
        return "AH" + String.valueOf(num).substring(1);
    }
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java
@@ -1,5 +1,8 @@
package com.stylefeng.guns.modular.system.util;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -44,6 +47,9 @@
    @Autowired
    private RestTemplate restTemplate;
    @Autowired
    private RedisUtil redisUtil;
@@ -124,6 +130,34 @@
    }
    public String getWxAppletsAccessToken(){
        String wxAppletsAccessToken = redisUtil.getValue("wxAppletsAccessToken");
        if(ToolUtil.isNotEmpty(wxAppletsAccessToken)){
            return wxAppletsAccessToken;
        }
        String appletsAccessToken = getAppletsAccessToken();
        redisUtil.setStrValue("wxAppletsAccessToken", appletsAccessToken, 7200);
        return appletsAccessToken;
    }
    /**
     * 获取微信小程序token
     * @return
     */
    public String getAppletsAccessToken() {
        String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret;
        HttpRequest get = HttpUtil.createGet(url);
        HttpResponse response = get.execute();
        if(response.getStatus() != 200){
            return "";
        }
        JSONObject jsonObject = JSON.parseObject(response.body());
        return jsonObject.getString("access_token");
    }
    /***
     * 获取acess_token (公众号)
     * 来源www.vxzsk.com
@@ -137,7 +171,7 @@
    }
    public String getUrlLink(String path, String query) throws Exception{
        String wxAppletsAccessToken = getAccessToken();
        String wxAppletsAccessToken = getWxAppletsAccessToken();
        String url = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + wxAppletsAccessToken;
        Map<String, Object> param = new HashMap<>();
        param.put("expire_type", 1);
@@ -155,7 +189,7 @@
    }
    public String getPhone(String code) throws Exception{
        String wxAppletsAccessToken = getAccessToken();
        String wxAppletsAccessToken = getWxAppletsAccessToken();
        String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + wxAppletsAccessToken;
        Map<String, Object> param = new HashMap<>();
        param.put("code",code);
@@ -181,16 +215,16 @@
    
    @Autowired
    private UserInfoController userInfoController;
    public String rid(String path, String query) throws Exception{
    public String rid(String path, Integer driverId) throws Exception{
        // 获取access_token
        String accessToken = getAccessToken();
        String accessToken = getWxAppletsAccessToken();
        // 替换CREATE_CODE_URL
        String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token="+accessToken;
        // 发送请求
        String stringApiResult = null;
        try {
            HashMap<String, String> map = new HashMap<>();
            map.put("path", path+"?driverId=979");
            map.put("path", path+"?driverId=" + driverId);
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity requestEntity = new HttpEntity(map, headers);
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
@@ -169,7 +169,7 @@
            userInfoWarpper.setNickName(null != map.get("nickName") ? String.valueOf(map.get("nickName")) : "");
            userInfoWarpper.setPhone(null != map.get("phone") ? String.valueOf(map.get("phone")) : "");
            userInfoWarpper.setIsAuth(null != map.get("isAuth") ? Integer.valueOf(String.valueOf(map.get("isAuth"))) : null);
            userInfoWarpper.setAvatar(null != map.get("avatar") ? String.valueOf(map.get("avatar")) : "http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfoWarpper.setAvatar(null != map.get("avatar") ? String.valueOf(map.get("avatar")) : "https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            userInfoWarpper.setSex(null != map.get("sex") ? Integer.valueOf(String.valueOf(map.get("sex"))) : null);
            userInfoWarpper.setBirthday(null != map.get("birthday") ? String.valueOf(map.get("birthday")) : "");
            userInfoWarpper.setIntegral(null != map.get("integral") ? Integer.valueOf(String.valueOf(map.get("integral"))) : 0);
UserAHTravel/guns-admin/src/main/resources/application.yml
@@ -91,10 +91,10 @@
  grantType: authorization_code #填authorization_code
  appid: 111 #应用唯一标识,在微信开放平台提交应用审核通过后获得
  appSecret: 111 #应用密钥AppSecret,在微信开放平台提交应用审核通过后获得
  appletsAppid: wx1e3ffc473b238a2a #小程序APPid
  appletsAppSecret: 6346afbc7afc56a008ef888ed5b74500 #
  mchId: 1618978168 #微信支付分配的商户号
  key: BTisLYCrwstKZRTBZef5pe51SCA7Kxe1 #key为商户平台设置的密钥key:
  appletsAppid: wxe91f1af7638aa5dd #小程序APPid
  appletsAppSecret: a787e1a462715604e0c9528b6d8960d1 #
  mchId: 1678345627 #微信支付分配的商户号
  key: E10ADC3949BA59ABBE56E057F20F883E #key为商户平台设置的密钥key:
---