补充菜单权限

SLN/%PUBPRJ%-core/src/main/resources/deprivs/DEPrivs.json.ftl → SLN/%PUBPRJ%-core/src/main/resources/permission/systemResource.json.ftl

@@ -122,9 +122,9 @@ TARGET=PSSYSTEM
         <#list menuGroup.getPSAppMenuItems() as appMenuItem>
             <#assign singMenuItem="">
             <#if appMenuItem.getPSAppMenuItems()??>
-                <#assign result_MenuItems=result_MenuItems+"{\"id\":\""+appMenuItem.id+"\" , \"name\":\""+appMenuItem.name+"\" , \"text\":\""+appMenuItem.getCaption()+"\" , \"items\":"+getAppMenuItems(appMenuItem)+"}">
+                <#assign result_MenuItems=result_MenuItems+"{ \"id\":\""+appMenuItem.name+"\" , \"name\":\""+appMenuItem.getCaption()+"\" , \"items\":"+getAppMenuItems(appMenuItem)+"}">
             <#else>
-                <#assign result_MenuItems=result_MenuItems+"{\"id\":\""+appMenuItem.id+"\" , \"name\":\""+appMenuItem.name+"\" , \"text\":\""+appMenuItem.getCaption()+"\" }">
+                <#assign result_MenuItems=result_MenuItems+"{ \"id\":\""+appMenuItem.name+"\" , \"name\":\""+appMenuItem.getCaption()+"\" }">
             </#if>
             <#if appMenuItem_has_next>
                 <#assign result_MenuItems=result_MenuItems+",">

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZUAAFallback.java.ftl

@@ -6,13 +6,14 @@ package ${pub.getPKGCodeName()}.util.client;
 import ${pub.getPKGCodeName()}.util.security.AuthenticationUser;
 import ${pub.getPKGCodeName()}.util.security.AuthorizationLogin;
 import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSONObject;
 import java.util.Map;
 
 @Component
 public class IBZUAAFallback implements IBZUAAFeignClient {
 
     @Override
-    public Map<String, Object> pushSystemPermissionData(Map<String, Object> systemPermissionData, String systemId) {
+    public JSONObject pushSystemPermissionData(Map<String, Object> systemPermissionData, String systemId) {
         return null;
     }
 

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZUAAFeignClient.java.ftl

@@ -7,6 +7,7 @@ import ${pub.getPKGCodeName()}.util.security.AuthenticationUser;
 import ${pub.getPKGCodeName()}.util.security.AuthorizationLogin;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import com.alibaba.fastjson.JSONObject;
 import java.util.Map;
 
 @FeignClient(value = "ibzuaa-api",fallback = IBZUAAFallback.class)
@@ -19,7 +20,7 @@ public interface IBZUAAFeignClient
 	 * @return
 	 */
 	@PostMapping("/uaa/permission/save")
-	Map<String,Object> pushSystemPermissionData(@RequestBody Map<String, Object> systemPermissionData,  @RequestParam("systemid") String systemId);
+	JSONObject pushSystemPermissionData(@RequestBody Map<String, Object> systemPermissionData,  @RequestParam("systemid") String systemId);
 
 	/**
 	 * 用户登录

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/job/PermissionSyncJob.java.ftl

@@ -43,15 +43,20 @@ public class PermissionSyncJob implements ApplicationRunner {
     public void run(ApplicationArguments args) {
         if(enablePermissionValid){
             try {
-                InputStream permission= this.getClass().getResourceAsStream("/deprivs/DEPrivs.json"); //获取当前系统所有实体资源能力
+                InputStream permission= this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力
                 String permissionResult = IOUtils.toString(permission,"UTF-8");
                 JSONObject jsonNodePermission = JSONObject.parseObject(permissionResult);
                 Map<String,Object> map=new HashMap<>();
                 map.put("permission",jsonNodePermission);
-                client.pushSystemPermissionData(map,systemId);
+                JSONObject syncResult=client.pushSystemPermissionData(map,systemId);
+                if(syncResult.getInteger("code")==1){
+                    log.info("向[UAA]同步系统资源成功");
+                }else{
+                    log.info(String.format("向[UAA]同步系统资源失败，失败原因为[%s]",syncResult.getString("msg")));
+                }
             }
             catch (Exception ex) {
-                log.error(String.format("向UAA同步数据发生错误，请检查UAA服务是否正常! [%s]",ex));
+                log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
             }
         }
     }

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/rest/AppController.java.ftl

@@ -26,13 +26,16 @@ public class AppController {
 
 		JSONObject appData = new JSONObject() ;
 		JSONArray uniRes=new JSONArray();
+    	JSONArray appMenu=new JSONArray();
 		if(enablePermissionValid){
 			JSONObject userPermission=AuthenticationUser.getAuthenticationUser().getPermissionList();
 			if(!ObjectUtils.isEmpty(userPermission)){
 				uniRes = userPermission.getJSONArray("unires");
+    			appMenu = userPermission.getJSONArray("appmenu");
 			}
 		}
 		appData.put("unires",uniRes);
+    	appData.put("appmenu",appMenu);
 		appData.put("enablepermissionvalid",enablePermissionValid);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}