修改

jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -39,6 +39,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
@@ -246,7 +247,6 @@ public class SysLoginController extends BaseController {
 //		QueryWrapper<SysMenu> menuQueryWrapper = Wrappers.query();
 //		menuQueryWrapper.in("perms",functionPerms);
 //		List<SysMenu> menus = sysMenuService.list(menuQueryWrapper);
-
 		WaterResult result = waterRequestUtil.getUserResource(token);
 		List<SingleMenu> singleMenus = JSONObject.parseArray(result.getData(), SingleMenu.class);
 		List<SingleMenu> singleAllMenus = new ArrayList<>();
@@ -283,6 +283,7 @@ public class SysLoginController extends BaseController {
 		}
 
 		@Override
+		@Transactional
 		public void run() {
 			WaterResult waterResult = waterRequestUtil.authUser(token);
 			String data = waterResult.getData();
@@ -292,6 +293,10 @@ public class SysLoginController extends BaseController {
 			QueryWrapper<SysRole> query = Wrappers.query();
 			query.in("role_key", roles);
 			List<SysRole> roleList = sysRoleService.list(query);
+			if (!roleList.isEmpty()) {
+				QueryWrapper<SysRoleMenu> sysRoleMenuQueryWrapper = Wrappers.query();
+				query.in("role_id", roleList.stream().map(role -> role.getId()).collect(Collectors.toList()));
+				sysRoleMenuService.remove(sysRoleMenuQueryWrapper);
 				for (SysRole sysRole : roleList) {
 					for (SysMenu menu : menus) {
 						SysRoleMenu sysRoleMenu = new SysRoleMenu();
@@ -303,5 +308,6 @@ public class SysLoginController extends BaseController {
 				}
 			}
 		}
+	}
 
 }

jwtech-admin/src/main/resources/application-test.yml

@@ -228,7 +228,8 @@ ignored:
   /system/user/exportExcel,
   /system/kaptcha/render,
   /test/**,
-  /signOnLogin
+  /signOnLogin,
+  /callBack/notify
 # http请求连接池
 http:
   pool:
@@ -257,8 +258,8 @@ water:
   systemCode: sgc-jg
   systemName: 水工程应用-水利工程建设管理模块
   #请求测试环境网关
-  url: http://19.25.35.204:31190/data_center/gateway/api
+#  url: http://19.25.35.204:31190/data_center/gateway/api
-#  url: http://119.25.40.10:31190/data_center/gateway/portal
+  url: http://19.25.40.10:31190/data_center/gateway/portal
   #应用token
   paasToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzeXN0ZW1JZCI6IjE3MzI3MDMxMTE1NDc0ODIxMTQifQ.4oiD3WBwrxT5z8goAvA9O88vsYVxwaE-8vyQmWl7xbg
   #应用id