ibiz4j 部署微服务接口

config.xml

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

ibztask-core/src/main/resources/mapper/task/jobsinfo/JobsInfoMapper.xml

@@ -39,32 +39,32 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APP`, t1.`AUTHOR`, t1.`CREATE_TIME`, t1.`CRON`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`LAST_TIME`, t1.`NEXT_TIME`, t1.`PARAM`, t1.`REMARK`, t1.`STATUS`, t1.`TENANT_ID`, t1.`TIMEOUT`, t1.`UPDATE_TIME` FROM `JOBS_INFO` t1  
+		<![CDATA[ SELECT t1.`APP`, t1.`AUTHOR`, t1.`CREATE_TIME`, t1.`CRON`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`LAST_TIME`, t1.`NEXT_TIME`, t1.`PARAM`, t1.`REMARK`, t1.`STATUS`, t1.`TENANT_ID`, t1.`TIMEOUT`, t1.`UPDATE_TIME` FROM `JOBS_INFO` t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-       <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-       <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`APP`, t1.`AUTHOR`, t1.`CREATE_TIME`, t1.`CRON`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`LAST_TIME`, t1.`NEXT_TIME`, t1.`PARAM`, t1.`REMARK`, t1.`STATUS`, t1.`TENANT_ID`, t1.`TIMEOUT`, t1.`UPDATE_TIME` FROM `JOBS_INFO` t1  
+		<![CDATA[ SELECT t1.`APP`, t1.`AUTHOR`, t1.`CREATE_TIME`, t1.`CRON`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`LAST_TIME`, t1.`NEXT_TIME`, t1.`PARAM`, t1.`REMARK`, t1.`STATUS`, t1.`TENANT_ID`, t1.`TIMEOUT`, t1.`UPDATE_TIME` FROM `JOBS_INFO` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="oracle">
-       <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-       <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+		<![CDATA[ SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
 </mapper>

ibztask-core/src/main/resources/mapper/task/jobslock/JobsLockMapper.xml

@@ -34,32 +34,32 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATE_TIME`, t1.`ID`, t1.`NAME`, t1.`OWNER` FROM `JOBS_LOCK` t1  
+		<![CDATA[ SELECT t1.`CREATE_TIME`, t1.`ID`, t1.`NAME`, t1.`OWNER` FROM `JOBS_LOCK` t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-       <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
+		<![CDATA[ SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-       <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
+		<![CDATA[ SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATE_TIME`, t1.`ID`, t1.`NAME`, t1.`OWNER` FROM `JOBS_LOCK` t1  
+		<![CDATA[ SELECT t1.`CREATE_TIME`, t1.`ID`, t1.`NAME`, t1.`OWNER` FROM `JOBS_LOCK` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="oracle">
-       <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
+		<![CDATA[ SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-       <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
+		<![CDATA[ SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
 			]]>
     </sql>
 </mapper>

ibztask-core/src/main/resources/mapper/task/jobslog/JobsLogMapper.xml

@@ -39,32 +39,32 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ADDRESS`, t1.`CREATE_TIME`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`JOB_ID`, t1.`PARAM`, t1.`TRIGGER_CODE`, t1.`TRIGGER_TYPE` FROM `JOBS_LOG` t1  
+		<![CDATA[ SELECT t1.`ADDRESS`, t1.`CREATE_TIME`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`JOB_ID`, t1.`PARAM`, t1.`TRIGGER_CODE`, t1.`TRIGGER_TYPE` FROM `JOBS_LOG` t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-       <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-       <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ADDRESS`, t1.`CREATE_TIME`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`JOB_ID`, t1.`PARAM`, t1.`TRIGGER_CODE`, t1.`TRIGGER_MSG`, t1.`TRIGGER_TYPE` FROM `JOBS_LOG` t1  
+		<![CDATA[ SELECT t1.`ADDRESS`, t1.`CREATE_TIME`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`JOB_ID`, t1.`PARAM`, t1.`TRIGGER_CODE`, t1.`TRIGGER_MSG`, t1.`TRIGGER_TYPE` FROM `JOBS_LOG` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="oracle">
-       <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-       <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
 			]]>
     </sql>
 </mapper>

ibztask-core/src/main/resources/mapper/task/jobsregistry/JobsRegistryMapper.xml

@@ -34,32 +34,32 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ADDRESS`, t1.`APP`, t1.`ID`, t1.`STATUS`, t1.`UPDATE_TIME` FROM `JOBS_REGISTRY` t1  
+		<![CDATA[ SELECT t1.`ADDRESS`, t1.`APP`, t1.`ID`, t1.`STATUS`, t1.`UPDATE_TIME` FROM `JOBS_REGISTRY` t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-       <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-       <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`ADDRESS`, t1.`APP`, t1.`ID`, t1.`STATUS`, t1.`UPDATE_TIME` FROM `JOBS_REGISTRY` t1  
+		<![CDATA[ SELECT t1.`ADDRESS`, t1.`APP`, t1.`ID`, t1.`STATUS`, t1.`UPDATE_TIME` FROM `JOBS_REGISTRY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="oracle">
-       <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-       <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
+		<![CDATA[ SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
 			]]>
     </sql>
 </mapper>

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

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

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

@@ -3,9 +3,22 @@ services:
   ibztask-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40005:40005"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40005
+      - 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
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibztask-util/src/main/resources/application-sys.yml

@@ -67,6 +67,13 @@ feign:
     enabled: true
   sentinel:
     enabled: true
+  compression:
+    request:
+      enabled: true
+      mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
+      min-response-size: 10240
+    response:
+      enabled: true
 
 #Log配置
 logging:
@@ -92,3 +99,10 @@ jobs:
   app-port: 9999
   #app-ip: 127.0.0.1
 
+### 启用Gzip压缩
+server:
+  compression:
+    enabled: true
+    mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 10240
+