修改bug

Pu Zhibing

1 天以前 bf174ea0bf750cf0818bc7b3472cbdc7485fdf18

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java

@@ -27,6 +27,7 @@
import com.supersavedriving.driver.modular.system.util.weChat.WeChatUtil;
import com.supersavedriving.driver.modular.system.util.weChat.model.Code2Session;
import com.supersavedriving.driver.modular.system.warpper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -67,6 +68,7 @@
* @author pzb
* @Date 2023/2/8 18:52
*/
@Slf4j
@Service
public class DriverServiceImpl extends ServiceImpl<DriverMapper, Driver> implements IDriverService {

@@ -223,8 +225,8 @@
        String pictureName = "driver_" + driverId + ".png";
        File file = FileUtil.writeFromStream(release, new File(filePath + pictureName));
        HttpRequest post = HttpUtil.createPost(adminUrl + "/upload/image");
        HttpRequest form = post.form("file", file);
        HttpResponse execute = form.execute();
        post.form("file", file);
        HttpResponse execute = post.execute();
        int status = execute.getStatus();
        if(200 != status){
            throw new RuntimeException("上传图片异常");
@@ -237,8 +239,8 @@
        String pictureName = "driver_" + driverId + ".png";
        File file = FileUtil.writeFromStream(release, new File(filePath + pictureName));
        HttpRequest post = HttpUtil.createPost(adminUrl + "/upload/image");
        HttpRequest form = post.form("file", file);
        HttpResponse execute = form.execute();
        post.form("file", file);
        HttpResponse execute = post.execute();
        int status = execute.getStatus();
        if(200 != status){
            throw new RuntimeException("上传图片异常");
@@ -344,28 +346,33 @@
        tokenWarpper.setValidTime(7200L);
        tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);

        String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
        if(ToolUtil.isNotEmpty(RYToken)){
            JSONObject jsonObject = JSON.parseObject(RYToken);
            Integer code1 = jsonObject.getInteger("code");
            if(200 == code1){
                tokenWarpper.setRytoken(jsonObject.getString("token"));
            }
        }

        if(ToolUtil.isEmpty(driver.getReferralCode())){
            String s = wechatMiniProgramORCode(driver.getId());
            driver.setReferralCode(s);
            this.updateById(driver);
        }
        if(ToolUtil.isEmpty(driver.getOrderQRCode())){
            String s = wechatMiniOrderQRCode(driver.getId());
            driver.setOrderQRCode(s);
            this.updateById(driver);
        }
//        String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
//        if(ToolUtil.isNotEmpty(RYToken)){
//            JSONObject jsonObject = JSON.parseObject(RYToken);
//            Integer code1 = jsonObject.getInteger("code");
//            if(200 == code1){
//                tokenWarpper.setRytoken(jsonObject.getString("token"));
//            }
//        }
        // todo 正式放开
//        if(ToolUtil.isEmpty(driver.getReferralCode())){
//            String s = wechatMiniProgramORCode(driver.getId());
//            driver.setReferralCode(s);
//            this.updateById(driver);
//        }
//        if(ToolUtil.isEmpty(driver.getOrderQRCode())){
//            String s = wechatMiniOrderQRCode(driver.getId());
//            driver.setOrderQRCode(s);
//            this.updateById(driver);
//        }
        return ResultUtil.success(tokenWarpper);
    }


    public static void main(String[] args) {
        String s = ShiroKit.md5(MD5AndKL.MD5("123456"), "i#sm4");
        System.out.println(s);
    }

    /**
     * 司机密码登录
@@ -452,13 +459,14 @@
            redisUtil.setStrValue(key, driver.getId().toString(), 94608000);//7天
            redisUtil.setStrValue("DRIVER_" + phone, key, 94608000);//7天

            // todo 正式放开
            //下线
            for (int i = 0; i < 5; i++) {
                Integer code = pushUtil.pushOffline(driver.getId(), 2);
                if(200 == code){
                    break;
                }
            }
//            for (int i = 0; i < 5; i++) {
//                Integer code = pushUtil.pushOffline(driver.getId(), 2);
//                if(200 == code){
//                    break;
//                }
//            }
            return token;
        }
        return "";
@@ -603,6 +611,7 @@
        Double lat = driverPositionWarpper.getLat();
        Integer driverId = driverPositionWarpper.getDriverId();
        Integer orderId = driverPositionWarpper.getOrderId();
        log.info("存储地理空间：{}", driverPositionWarpper);
        redisUtil.setStrValue("daijia:DRIVER" + driverId, lon + "," + lat, 30);
        Query query = Query.query(Criteria.where("driverId").is(driverId));
        Location old = this.mongoTemplate.findOne(query, Location.class);