|
@@ -96,7 +96,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
|
|
serviceToken.setAppKeyId(GuidUtil.App_key());
|
|
serviceToken.setAppKeyId(GuidUtil.App_key());
|
|
serviceToken.setAppKeySecret(GuidUtil.App_screct());
|
|
serviceToken.setAppKeySecret(GuidUtil.App_screct());
|
|
serviceToken.setStatus(1);
|
|
serviceToken.setStatus(1);
|
|
- if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial)) {
|
|
|
|
|
|
+ if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial.getKey())) {
|
|
//如果试用已过期,不允许再生成
|
|
//如果试用已过期,不允许再生成
|
|
if (calendar.after(old_serviceToken.getExpiringDate())) {
|
|
if (calendar.after(old_serviceToken.getExpiringDate())) {
|
|
productServiceRespDTO.setMsg("当前试用账号已过期,不允许再生成令牌");
|
|
productServiceRespDTO.setMsg("当前试用账号已过期,不允许再生成令牌");
|
|
@@ -104,7 +104,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
|
|
}
|
|
}
|
|
serviceToken.setStartingDate(old_serviceToken.getStartingDate());
|
|
serviceToken.setStartingDate(old_serviceToken.getStartingDate());
|
|
serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
|
|
serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
|
|
- } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial)) {
|
|
|
|
|
|
+ } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial.getKey())) {
|
|
serviceToken.setStartingDate(new Date());
|
|
serviceToken.setStartingDate(new Date());
|
|
calendar.clear();
|
|
calendar.clear();
|
|
calendar.setTime(new Date());
|
|
calendar.setTime(new Date());
|