fix test problem

robinhood-jim · robinhood-jim · commit 1595320acfbf · 2025-07-11T19:36:37.000+08:00
diff --git a/core/src/main/java/com/robin/core/hardware/MachineIdUtils.java b/core/src/main/java/com/robin/core/hardware/MachineIdUtils.java
@@ -150,21 +150,19 @@ public static String getHardDiskSerial() throws RuntimeException{
         try{
             if(isWindows()){
                 serial=CommandLineExecutor.getInstance().executeCmdReturnAfterRow(Arrays.asList("powershell.exe","Get-WmiObject","-Class","Win32_DiskDrive","|","Select-Object","SerialNumber,DeviceId"),2);
-                if(serial.contains("\n") || serial.contains("\r\n")){
-                    reader=new BufferedReader(new StringReader(serial));
-                    String tmpStr;
-                    String selSerial=null;
-                    int deviceId=10000;
-                    while((tmpStr=reader.readLine())!=null){
-                        String[] arr=tmpStr.split(" ");
-                        int currentdevice=Integer.parseInt(arr[1].substring(arr[1].length()-1));
-                        if(currentdevice<deviceId){
-                            selSerial=arr[0].trim();
-                            deviceId=currentdevice;
-                        }
+                reader=new BufferedReader(new StringReader(serial));
+                String tmpStr;
+                String selSerial=null;
+                int deviceId=10000;
+                while((tmpStr=reader.readLine())!=null){
+                    String[] arr=tmpStr.split(" ");
+                    int currentdevice=Integer.parseInt(arr[1].substring(arr[1].length()-1));
+                    if(currentdevice<deviceId){
+                        selSerial=arr[0].trim();
+                        deviceId=currentdevice;
                     }
-                    serial=selSerial;
                 }
+                serial=selSerial;
             }else if(isLinux()){
                 serial=CommandLineExecutor.getInstance().executeCmdReturnAfterRow(Arrays.asList("bash","-c","sudo lsblk -o SERIAL"),1);
 
diff --git a/example/base-example/src/main/java/com/robin/basis/model/user/SysUser.java b/example/base-example/src/main/java/com/robin/basis/model/user/SysUser.java
@@ -55,6 +55,4 @@ public class SysUser extends BaseObject {
     private String avatar;
     private String nickName;
     private String sex;
-    private LocalDateTime createTime;
-    private LocalDateTime updateTime;
 }
diff --git a/example/base-example/src/main/java/com/robin/basis/service/system/LoginService.java b/example/base-example/src/main/java/com/robin/basis/service/system/LoginService.java
@@ -142,7 +142,7 @@ public SysUser getUserInfo(String userName) {
         return users.get(0);
     }
 
-    public List<Long> getUserOrgs(Long userId) {
+    public List<Long> getUserRoles(Long userId) {
         FilterConditionBuilder builder = new FilterConditionBuilder();
         builder.addEq(SysUserRole::getUserId, userId).addEq(SysUserRole::getStatus, Const.VALID);
         List<SysUserRole> roles = sysUserRoleService.queryByCondition(builder.build());
diff --git a/example/base-example/src/main/java/com/robin/basis/service/system/SysResourceService.java b/example/base-example/src/main/java/com/robin/basis/service/system/SysResourceService.java
@@ -93,13 +93,13 @@ public Map<String, Object> getUserRights(Long userId) {
         if (!query1.getRecordSet().isEmpty()) {
             try {
                 Map<String, List<Map<String, Object>>> resTypeMap = CollectionMapConvert.convertToMapByParentMapKey(query1.getRecordSet(), "assignType");
-                Map<String, Map<String, Object>> accessResMap = resTypeMap.get("NULL").stream().collect(Collectors.toMap(f -> f.get("id").toString(), f -> f));
+                Map<String, Map<String, Object>> accessResMap = resTypeMap.get("0").stream().collect(Collectors.toMap(f -> f.get("id").toString(), f -> f));
                 if (!CollectionUtils.isEmpty(resTypeMap.get(Const.RESOURCE_ASSIGN_ACCESS))) {
                     accessResMap.putAll(resTypeMap.get(Const.RESOURCE_ASSIGN_ACCESS).stream().collect(Collectors.toMap(f -> f.get("id").toString(), f -> f)));
                 }
                 //positive assign
                 if (resTypeMap.containsKey(Const.RESOURCE_ASSIGN_ACCESS)) {
-                    for (Map<String, Object> tmap : resTypeMap.get(Const.RESOURCE_ASSIGN_DENIED)) {
+                    for (Map<String, Object> tmap : resTypeMap.get(Const.RESOURCE_ASSIGN_ACCESS)) {
                         if (!accessResMap.containsKey(tmap.get("id").toString())) {
                             accessResMap.put(tmap.get("id").toString(), tmap);
                         }
diff --git a/web/src/main/java/com/robin/core/web/service/ILoginService.java b/web/src/main/java/com/robin/core/web/service/ILoginService.java
@@ -3,10 +3,13 @@
 import com.robin.core.base.exception.ServiceException;
 import com.robin.core.web.util.Session;
 
+import java.util.List;
+
 public interface ILoginService {
     Session doLogin(String accountName, String password) throws ServiceException;
     void getRights(Session session);
     Session simpleLogin(String accountName, String password) throws ServiceException;
     Session ssoGetUserById(Long userId);
     Session ssoGetUser(String userName);
+    List<Long> getUserRoles(Long userId);
 }
diff --git a/web/src/main/java/com/robin/core/web/util/RestTemplateUtils.java b/web/src/main/java/com/robin/core/web/util/RestTemplateUtils.java
@@ -41,7 +41,7 @@ public static Map<String,Object> getResultFromSsoRest(String requestUrl,String t
     }
     public static Map<String,Object> getResultFromGateWayRest(String requestUrl,String token,Object... objects){
         Environment environment= SpringContextHolder.getBean(Environment.class);
-        String url=environment.getProperty("backgroud.gatewayUrl")+requestUrl;
+        String url=environment.getProperty("project.gatewayUrl")+requestUrl;
         HttpHeaders requestHeaders = new HttpHeaders();
         if(!StringUtils.isEmpty(token)) {
             requestHeaders.add(HttpHeaders.AUTHORIZATION,"Bearer "+token);

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,4 @@ public class SysUser extends BaseObject {`
`55`	`55`	`private String avatar;`
`56`	`56`	`private String nickName;`
`57`	`57`	`private String sex;`
`58`		`- private LocalDateTime createTime;`
`59`		`- private LocalDateTime updateTime;`
`60`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public SysUser getUserInfo(String userName) {`
`142`	`142`	`return users.get(0);`
`143`	`143`	`}`
`144`	`144`
`145`		`- public List<Long> getUserOrgs(Long userId) {`
	`145`	`+ public List<Long> getUserRoles(Long userId) {`
`146`	`146`	`FilterConditionBuilder builder = new FilterConditionBuilder();`
`147`	`147`	`builder.addEq(SysUserRole::getUserId, userId).addEq(SysUserRole::getStatus, Const.VALID);`
`148`	`148`	`List<SysUserRole> roles = sysUserRoleService.queryByCondition(builder.build());`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static Map<String,Object> getResultFromSsoRest(String requestUrl,String t`
`41`	`41`	`}`
`42`	`42`	`public static Map<String,Object> getResultFromGateWayRest(String requestUrl,String token,Object... objects){`
`43`	`43`	`Environment environment= SpringContextHolder.getBean(Environment.class);`
`44`		`- String url=environment.getProperty("backgroud.gatewayUrl")+requestUrl;`
	`44`	`+ String url=environment.getProperty("project.gatewayUrl")+requestUrl;`
`45`	`45`	`HttpHeaders requestHeaders = new HttpHeaders();`
`46`	`46`	`if(!StringUtils.isEmpty(token)) {`
`47`	`47`	`requestHeaders.add(HttpHeaders.AUTHORIZATION,"Bearer "+token);`