Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

whyclxw

2021-12-15 ada6760e4d8594ce0daceab156ef64157f66054c

Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

 src/main/java/com/whyc/controller/LicenseController.java

@@ -84,7 +84,7 @@
    @ApiOperation(value = "校验license")
    public Response checkSerialNumberLicense(@RequestParam String license){
        Response model = new Response();
        try {

            //获取macid是否一致
            boolean res = false;
            //初始化sm2参数x
@@ -97,14 +97,8 @@
                    + "Licence duration:";
            //获取解密后license,附带校验license编码格式
            String decryptResult = null;
            try {
                byte[] bytes = ByteConvertUtil.hexToByteArray(license);
                decryptResult = x.decrypt(bytes, privKey);
            } catch (Exception e) {
                e.printStackTrace();
                model.setMsg("lincense错误");
                return model;
            }
            //用户只能往小调时间
            String[] split1 = decryptResult.split("machineCode:");
            Long registerCodeTime = Long.valueOf(split1[0]);
@@ -118,13 +112,16 @@
                //long serialNumberLicenseTime = (long) getApplication().getAttribute("serialNumberLicenseTime");
                //if(currentTimeMillis-serialNumberLicenseTime>=5*60*1000){
                if (currentTimeMillis - machineCodeCreateTime >= 5 * 60 * 1000) {
                    model.setCode(0);
                model.setCode(1);
                model.setData(false);
                    model.setMsg("注册码获取及输入超过5分钟,请重新获取注册码");
                } else if (registerCodeTime > currentTimeMillis) {
                    model.setCode(0);
                model.setCode(1);
                model.setData(false);
                    model.setMsg("系统时间不正常,请检查");
                } else {
                    model.setCode(1);
                model.setData(true);
                    model.setMsg("注册码校验成功");
                }
                //model.setData(decryptResult);
@@ -141,15 +138,13 @@
                //将序列号,有效期 添加入license表
                service.add(data);
            } else {
                model.setCode(0);
            model.setCode(1);
            model.setData(false);
                model.setMsg("验证失败");
                //model.setData(decryptResult);
                //model.setMsgN(serialNumberStr);
            }
        }catch (Exception e){
            model.setCode(0);
            model.setMsg("验证失败");
        }

        return model;
    }


 src/main/java/com/whyc/service/BattalarmDataService.java

@@ -296,12 +296,8 @@

        //排序,按照时间或者说是num
        lista.sort(Comparator.comparing(BattalarmData::getAlmStartTime).reversed());

        if(lista!=null&&lista.size()>0){
            return new Response().set(1,lista,"查询成功");
        }else{
            return new Response().set(0,"查询失败");
        }

    }

}

 src/main/java/com/whyc/service/LicenseService.java

@@ -144,6 +144,7 @@
        userInfQueryWrapper.select("license").eq("uName",uName);
        String license = userInfMapper.selectOne(userInfQueryWrapper).getLicense();
        model.setCode(1);
        model.setData(true);
        model.setData(license);
        return model;
    }
@@ -177,18 +178,22 @@
                    String timeInUseEncrypt = license.getTimeInUse();
                    Long timeInUse = Long.valueOf(AESUtil.aesDecrypt(timeInUseEncrypt));
                    if (duration * 24 * 60 * 60 < timeInUse) {
                        model.setCode(0);
                        model.setCode(1);
                        model.setData(false);
                        model.setMsg("凭证已过期,有效期为:" + duration + "天");
                    }else{
                        model.setCode(1);
                        model.setData(true);
                    }
                }else {
                    model.setCode(1);
                    model.setData(true);
                }
            }

        }else{
            model.setCode(0);
            model.setCode(1);
            model.setData(false);
            model.setMsg("注册码尚未输入");
        }
        return model;