ibiz4j 部署微服务接口

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Pweb
-      cd ibzuaa-app/ibzuaa-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
+      mvn clean package -Papi
+      cd ibzuaa-provider/ibzuaa-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 30002
+EXPOSE 8080
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,23 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - ABC=1
-      - DEC=2
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,9 +3,21 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40002
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFallback.java

@@ -4,14 +4,13 @@ import cn.ibizlab.util.security.AuthenticationUser;
 import cn.ibizlab.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

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFeignClient.java

@@ -5,19 +5,18 @@ import cn.ibizlab.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);
 
 	/**
 	 * 用户登录

ibzuaa-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

 package cn.ibizlab.util.job;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import cn.ibizlab.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("${ibiz.enablePermissionValid:false}")
-    boolean enablePermissionValid;  //是否开启权限校验
 
     @Value("${ibiz.systemid:ibzuaa}")
     private String systemId;
 
     @Override
     public void run(ApplicationArguments args) {
-        if(enablePermissionValid){
         try {
+            Thread.sleep(10000);
             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){
+            if(client.pushSystemPermissionData(systemId,JSONObject.parseObject(permissionResult))){
                 log.info("向[UAA]同步系统资源成功");
             }else{
-                    log.info(String.format("向[UAA]同步系统资源失败，失败原因为[%s]",syncResult.getString("msg")));
+                log.info(String.format("向[UAA]同步系统资源失败"));
             }
         }
         catch (Exception ex) {
             log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
         }
     }
-    }
 }
\ No newline at end of file