From e78c402a248ff252ee93e724396c62d806087fab Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 03 七月 2022 10:32:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
---
src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java b/src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java
index 20209f2..02dedcf 100644
--- a/src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java
+++ b/src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java
@@ -4,12 +4,12 @@
import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
import java.util.List;
@@ -20,12 +20,10 @@
@Resource
private IRoleService roleService;
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@org.junit.jupiter.api.Test
void getAllUser() {
List<Role> all = roleService.getAll();
Role roleById = roleService.getRoleById(1);
- System.out.println();
}
@@ -36,8 +34,8 @@
Role role = new Role();
role.setName("test+" + i);
role.setAuthority("adadadda");
- role.setCreateTime(format.format(System.currentTimeMillis()));
- role.setUpdateTime(format.format(System.currentTimeMillis()));
+ role.setCreateTime(DateUtil.getNow());
+ role.setUpdateTime(DateUtil.getNow());
roleService.add(role);
}
}
--
Gitblit v1.8.0