ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

config.xml

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

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

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

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

@@ -3,22 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30000
-      - 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&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzrt-boot/src/main/resources/application-dev.yml

@@ -4,157 +4,157 @@ server:
 #zuul网关路由设置
 zuul:
   routes:
-      dict_catalog:
-        path: /dict_catalogs/**
-        serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
-        stripPrefix: false
-      dict_option:
-        path: /dict_options/**
-        serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
-        stripPrefix: false
-      jobs_info:
-        path: /jobs_infos/**
-        serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
-        stripPrefix: false
-      jobs_lock:
-        path: /jobs_locks/**
-        serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
-        stripPrefix: false
-      jobs_log:
-        path: /jobs_logs/**
-        serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
-        stripPrefix: false
-      jobs_registry:
-        path: /jobs_registries/**
-        serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
-        stripPrefix: false
-      sd_file:
-        path: /sd_files/**
-        serviceId: ${ibiz.ref.service.ibzdisk-api:ibzdisk-api}
-        stripPrefix: false
-      sys_app:
-        path: /sys_apps/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_authlog:
-        path: /sys_authlogs/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_dept:
-        path: /sys_depts/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_deptmember:
-        path: /sys_deptmembers/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_emp:
-        path: /sys_emps/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_open_access:
-        path: /sys_open_accesses/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_org:
-        path: /sys_orgs/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_pssystem:
-        path: /sys_pssystems/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_permission:
-        path: /sys_permissions/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_post:
-        path: /sys_posts/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_role:
-        path: /sys_roles/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_role_permission:
-        path: /sys_role_permissions/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_team:
-        path: /sys_teams/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_teammember:
-        path: /sys_teammembers/**
-        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
-        stripPrefix: false
-      sys_user:
-        path: /sys_users/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_user_auth:
-        path: /sys_user_auths/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      sys_user_role:
-        path: /sys_user_roles/**
-        serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
-        stripPrefix: false
-      wf_group:
-        path: /wf_groups/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_group_member:
-        path: /wf_group_members/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_definition:
-        path: /wf_definitions/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_instance:
-        path: /wf_instances/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_definition_node:
-        path: /wf_definition_nodes/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_model:
-        path: /wf_models/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_pssystem:
-        path: /wf_pssystems/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_task:
-        path: /wf_tasks/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_task_way:
-        path: /wf_task_ways/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      wf_user:
-        path: /wf_users/**
-        serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
-        stripPrefix: false
-      loginv7:
-        path: /v7/login
-        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-        stripPrefix: false
-      changepwd:
-        path: /v7/changepwd
-        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-        stripPrefix: false
-      uaa:
-        path: /uaa/**
-        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-        stripPrefix: false
-      config:
-        path: /configs/**
-        serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
-        stripPrefix: false
+    dict_catalog:
+      path: /dict_catalogs/**
+      serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
+      stripPrefix: false
+    dict_option:
+      path: /dict_options/**
+      serviceId: ${ibiz.ref.service.ibzdict-api:ibzdict-api}
+      stripPrefix: false
+    jobs_info:
+      path: /jobs_infos/**
+      serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
+      stripPrefix: false
+    jobs_lock:
+      path: /jobs_locks/**
+      serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
+      stripPrefix: false
+    jobs_log:
+      path: /jobs_logs/**
+      serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
+      stripPrefix: false
+    jobs_registry:
+      path: /jobs_registries/**
+      serviceId: ${ibiz.ref.service.ibztask-api:ibztask-api}
+      stripPrefix: false
+    sd_file:
+      path: /sd_files/**
+      serviceId: ${ibiz.ref.service.ibzdisk-api:ibzdisk-api}
+      stripPrefix: false
+    sys_app:
+      path: /sys_apps/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_authlog:
+      path: /sys_authlogs/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_dept:
+      path: /sys_depts/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_deptmember:
+      path: /sys_deptmembers/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_emp:
+      path: /sys_emps/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_open_access:
+      path: /sys_open_accesses/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_org:
+      path: /sys_orgs/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_pssystem:
+      path: /sys_pssystems/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_permission:
+      path: /sys_permissions/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_post:
+      path: /sys_posts/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_role:
+      path: /sys_roles/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_role_permission:
+      path: /sys_role_permissions/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_team:
+      path: /sys_teams/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_teammember:
+      path: /sys_teammembers/**
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+      stripPrefix: false
+    sys_user:
+      path: /sys_users/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_user_auth:
+      path: /sys_user_auths/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    sys_user_role:
+      path: /sys_user_roles/**
+      serviceId: ${ibiz.ref.service.ibzuaa-api:ibzuaa-api}
+      stripPrefix: false
+    wf_group:
+      path: /wf_groups/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_group_member:
+      path: /wf_group_members/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_definition:
+      path: /wf_definitions/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_instance:
+      path: /wf_instances/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_definition_node:
+      path: /wf_definition_nodes/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_model:
+      path: /wf_models/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_pssystem:
+      path: /wf_pssystems/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_task:
+      path: /wf_tasks/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_task_way:
+      path: /wf_task_ways/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    wf_user:
+      path: /wf_users/**
+      serviceId: ${ibiz.ref.service.ibzwf-api:ibzwf-api}
+      stripPrefix: false
+    loginv7:
+      path: /v7/login
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    changepwd:
+      path: /v7/changepwd
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    uaa:
+      path: /uaa/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    config:
+      path: /configs/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzrt-dependencies/pom.xml

@@ -233,12 +233,6 @@
                 <version>${jsonwebtoken-jjwt.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${alibaba-druid.version}</version>
-            </dependency>
-
              <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>problem-spring-web</artifactId>
@@ -351,6 +345,8 @@
         </dependency>
 
 
+
+
     </dependencies>
 
 </project>

ibzrt-util/src/main/java/cn/ibizlab/util/errors/ExceptionTranslator.java

@@ -101,7 +101,7 @@ public class ExceptionTranslator implements ProblemHandling {
 
     public static HttpHeaders createFailureAlert(String entityName, String errorKey, String defaultMessage) {
         HttpHeaders headers = new HttpHeaders();
-        headers.add("X-ibz-error", "error." + errorKey);
+        headers.add("X-ibz-error", errorKey);
         headers.add("X-ibz-params", entityName);
         return headers;
     }

ibzrt-util/src/main/java/cn/ibizlab/util/rest/AppController.java

@@ -59,6 +59,7 @@ public class AppController {
 			appData.put("enablepermissionvalid",false);
 		else
 			appData.put("enablepermissionvalid",enablePermissionValid);
+		fillAppData(appData);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}
 
@@ -87,4 +88,12 @@ public class AppController {
 			throw new BadRequestAlertException("获取配置失败，参数缺失","IBZConfig",configType);
 		return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
 	}
+
+	/**
+	* 应用参数扩展
+	* @param appData
+	*/
+	protected void fillAppData(JSONObject appData){
+
+	}
 }