登录页bug修改

jeecg-module-interlock/src/main/java/org/jeecg/modules/iotedgeCollectData/service/RestClientService.java

@@ -45,7 +45,7 @@ public class RestClientService {
      * des: 调用IoTEdge接口 获取Token
      * date: 2024/5/22
      */
-    private String getAccessToken() {
+    public String getAccessToken() {
         //String url = "http://127.0.0.1:8082/v1/auth";
         String url = configService.getConfigValue(ConfigInfo.GETTOKEN);
         String username = configService.getConfigValue(ConfigInfo.USERNAME);

jeecg-module-interlock/src/main/java/org/jeecg/modules/iotedgeCollectData/service/impl/IotedgeCollectDataServiceImpl.java

@@ -341,8 +341,10 @@ public class IotedgeCollectDataServiceImpl extends ServiceImpl<IotedgeCollectDat
     public String addIoTedgeUser(String userName, String ssoRole, String userId, String elToken) {
         String result = "200";
 
+        String iotToken = restClientService.getAccessToken();
+
         try {
-            JSONObject jsonObject = restClientService.invitationSSOUserInIoTEdge(userName, elToken);
+            JSONObject jsonObject = restClientService.invitationSSOUserInIoTEdge(userName, iotToken);
             String code = (String) jsonObject.get("code");
             String iotUserId = (String) jsonObject.get("userId");
 
@@ -352,10 +354,10 @@ public class IotedgeCollectDataServiceImpl extends ServiceImpl<IotedgeCollectDat
             String rloe = "";
             if ("globalAdmin".equals(ssoRole)){
                 rloe = "systemAdmin";
-                restClientService.setUserRole(iotUserId,"",rloe,elToken);
+                restClientService.setUserRole(iotUserId,"",rloe,iotToken);
             }else {
-                restClientService.setUserRole(iotUserId,"","systemAdmin",elToken);
-                restClientService.deleteUserRole(iotUserId,"","systemAdmin",elToken);
+                restClientService.setUserRole(iotUserId,"","systemAdmin",iotToken);
+                restClientService.deleteUserRole(iotUserId,"","systemAdmin",iotToken);
             }
         } catch (Exception e) {
             log.info("IoTEdge邀请SSO用户失败: {}"+e.getMessage());

jeecg-module-interlock/src/main/java/org/jeecg/modules/ssoClient/controller/SSOLoginLogoutController.java

@@ -599,7 +599,8 @@ public class SSOLoginLogoutController {
             List<InterlockSystemLimit> interlockSystemLimitList = interlockSystemLimitService.getInterlockAdminSystemLimitList(interlockUser.getUsername(), userId);
             interlockSystemLimitService.saveBatch(interlockSystemLimitList);
 
-            restClientService.setUserRole(interlockUser.getIotUserid(),"","systemAdmin",elToken);
+            String accessToken = restClientService.getAccessToken();
+            restClientService.setUserRole(interlockUser.getIotUserid(),"","systemAdmin",accessToken);
 
             baseCommonService.addLog("修改用户，username： " + interlockUser.getUsername(), CommonConstant.LOG_TYPE_2, 2);
         } catch (Exception e) {