系统资源同步

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

@@ -7,14 +7,13 @@ 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 JSONObject pushSystemPermissionData(Map<String, Object> systemPermissionData, String systemId) {
-        return null;
+    public boolean pushSystemPermissionData(String systemid,JSONObject systemPermissionData) {
+        return false;
     }
 
     @Override

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

@@ -8,19 +8,18 @@ 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)
 public interface IBZUAAFeignClient
 {
 	/**
 	 * 推送系统权限数据到uaa
+	 * @param systemid
 	 * @param systemPermissionData
-	 * @param systemId
 	 * @return
 	 */
-	@PostMapping("/uaa/permission/save")
-	JSONObject pushSystemPermissionData(@RequestBody Map<String, Object> systemPermissionData,  @RequestParam("systemid") String systemId);
+	@PostMapping("/syspssystems/{systemid}/permissiondata")
+	boolean pushSystemPermissionData(@PathVariable("systemid") String systemid,@RequestBody JSONObject systemPermissionData);
 
 	/**
 	 * 用户登录

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

@@ -4,60 +4,50 @@ TARGET=PSSYSTEM
 <#assign sid = sys.getName()/>
 package ${pub.getPKGCodeName()}.util.job;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import ${pub.getPKGCodeName()}.util.client.IBZUAAFeignClient;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
-import java.io.IOException;
 
 /**
  * 权限：向uaa同步当前系统菜单、权限资源任务类
  */
-//@Component   //开启此类需要保证Main中开启了feign ：EnableFeignClients
+@Slf4j
+@Component
+@ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
 public class PermissionSyncJob implements ApplicationRunner {
 
-    private Log log = LogFactory.getLog(PermissionSyncJob.class);
 
     @Autowired
+    @Lazy
     private IBZUAAFeignClient client;
 
-    @Value("${r'${ibiz.enablePermissionValid:false}'}")
-    boolean enablePermissionValid;  //是否开启权限校验
 
     @Value("${r'$'}{ibiz.systemid:${sid}}")
     private String systemId;
 
     @Override
     public void run(ApplicationArguments args) {
-        if(enablePermissionValid){
-            try {
-                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);
-                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));
+        try {
+            Thread.sleep(10000);
+            InputStream permission= this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力
+            String permissionResult = IOUtils.toString(permission,"UTF-8");
+            if(client.pushSystemPermissionData(systemId,JSONObject.parseObject(permissionResult))){
+                log.info("向[UAA]同步系统资源成功");
+            }else{
+                log.info(String.format("向[UAA]同步系统资源失败"));
             }
         }
+        catch (Exception ex) {
+            log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
+        }
     }
 }
\ No newline at end of file