Skip to content

I
ibztask
提交 9e438a02 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibiz-task，任务调度]

上级 51829628
显示空白字符变更
内嵌 并排
正在显示 包含 243 行增加 和 5 行删除
ibztask-app/ibztask-app-web/pom.xml
浏览文件 @ 9e438a02
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<artifactId>ibztask-app-web</artifactId> <artifactId>ibztask-app-web</artifactId>
<name>Ibztask Gateway web</name> <name>Ibztask Gateway web</name>
<description>Ibztask web</description> <description>Ibztask web</description>
<packaging>${project.packaging}</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.packaging>jar</project.packaging>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix> <docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties> </properties>
...@@ -144,6 +146,125 @@ ...@@ -144,6 +146,125 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>web-war</id>
<properties>
<project.packaging>war</project.packaging>
</properties>
<build>
<resources>
<resource>
<directory>${basedir}/src/main/webapp</directory>
<!--注意此次必须要放在此目录下才能被访问到 -->
<targetPath>META-INF/resources</targetPath>
<includes>
<include>**/**</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<id>exec-yarn-run-install</id>
<phase>prepare-package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>yarn</executable>
<workingDirectory>../../app_web</workingDirectory>
</configuration>
</execution>
<execution>
<id>exec-yarn-run-build</id>
<phase>prepare-package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>yarn</executable>
<arguments>
<argument>build</argument>
</arguments>
<workingDirectory>../../app_web</workingDirectory>
</configuration>
</execution>
<execution>
<id>prepare</id>
<configuration>
<executable>cp</executable>
<arguments>
<argument>../../${project.artifactId}.war</argument>
<argument>${project.basedir}/src/main/dockerwar/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>buildpush</id>
<configuration>
<executable>docker</executable>
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>--platform</argument>
<argument>linux/arm64</argument>
<argument>-t</argument>
<argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
<argument>${project.basedir}/src/main/dockerwar</argument>
<argument>--push</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>ibztask-app-web</finalName>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<mainClass>cn.ibizlab.web.webApplication</mainClass>
<outputDirectory>../../</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/dockerwar</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.war</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>
......
ibztask-app/ibztask-app-web/src/main/dockerwar/Dockerfile 0 → 100644
浏览文件 @ 9e438a02
FROM registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
ENV TZ Asia/Shanghai
ENV LANG C.UTF-8
WORKDIR /opt/tongtech
ADD ibztask-app-web.war .
RUN echo -e 'export LANG="zh_CN.UTF-8"\nexport LC_ALL="zh_CN.UTF-8"' > /etc/locale.conf
RUN unzip -oq ibztask-app-web.war -d ./TongWeb7.0/deployment/jcyweb
ENTRYPOINT /opt/tongtech/TongWeb7.0/bin/startserver.sh
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @ 9e438a02
...@@ -196,17 +196,17 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i ...@@ -196,17 +196,17 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override @Override
@Transactional @Transactional
public JobsInfo start(JobsInfo et) { public JobsInfo start(JobsInfo et) {
et.set("Last_time","0");
et.set("Status","0"); et.set("Status","0");
et.set("Last_time","0");
update(et); update(et);
return et; return et;
} }
@Override @Override
@Transactional @Transactional
public JobsInfo stop(JobsInfo et) { public JobsInfo stop(JobsInfo et) {
et.set("Next_time","0");
et.set("Last_time","0"); et.set("Last_time","0");
et.set("Status","1"); et.set("Status","1");
et.set("Next_time","0");
update(et); update(et);
return et; return et;
} }
......
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 9e438a02
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[JOBS_INFO]数据结构 --> <!--输出实体[JOBS_INFO]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_info-5-1"> <changeSet author="a_A_5d9d78509" id="tab-jobs_info-6-1">
<createTable tableName="JOBS_INFO"> <createTable tableName="JOBS_INFO">
<column name="ID" remarks="" type="VARCHAR(100)"> <column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/> <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</column> </column>
<column name="AUTHOR" remarks="" type="VARCHAR(30)"> <column name="AUTHOR" remarks="" type="VARCHAR(30)">
</column> </column>
<column name="REMARK" remarks="" type="VARCHAR(30)"> <column name="REMARK" remarks="" type="VARCHAR(300)">
</column> </column>
<column name="STATUS" remarks="" type="INT"> <column name="STATUS" remarks="" type="INT">
</column> </column>
......
ibztask-core/src/main/resources/sysmodel/ibztask.json
浏览文件 @ 9e438a02
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
"nullable":1, "nullable":1,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":30, "data_length":300,
"key_field":0, "key_field":0,
"show_order":12, "show_order":12,
"major_field":0 "major_field":0
......
ibztask-provider/ibztask-provider-api/pom.xml
浏览文件 @ 9e438a02
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<artifactId>ibztask-provider-api</artifactId> <artifactId>ibztask-provider-api</artifactId>
<name>Ibztask Microservice api</name> <name>Ibztask Microservice api</name>
<description> microservice</description> <description> microservice</description>
<packaging>${project.packaging}</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -21,10 +22,13 @@ ...@@ -21,10 +22,13 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<project.packaging>jar</project.packaging>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix> <docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>
<id>api</id> <id>api</id>
...@@ -111,6 +115,95 @@ ...@@ -111,6 +115,95 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>api-war</id>
<properties>
<project.packaging>war</project.packaging>
</properties>
<build>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>ibztask-provider-api</finalName>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<mainClass>cn.ibizlab.api.ibztaskapiApplication</mainClass>
<outputDirectory>../../</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/dockerwar</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.war</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>prepare</id>
<configuration>
<executable>cp</executable>
<arguments>
<argument>../../${project.artifactId}.war</argument>
<argument>${project.basedir}/src/main/dockerwar/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>buildpush</id>
<configuration>
<executable>docker</executable>
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>--platform</argument>
<argument>linux/arm64</argument>
<argument>-t</argument>
<argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
<argument>${project.basedir}/src/main/dockerwar</argument>
<argument>--push</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>
ibztask-provider/ibztask-provider-api/src/main/dockerwar/Dockerfile 0 → 100644
浏览文件 @ 9e438a02
FROM registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
ENV TZ Asia/Shanghai
ENV LANG C.UTF-8
WORKDIR /opt/tongtech
ADD ibztask-provider-api.war .
RUN echo -e 'export LANG="zh_CN.UTF-8"\nexport LC_ALL="zh_CN.UTF-8"' > /etc/locale.conf
RUN unzip -oq ibztask-provider-api.war -d ./TongWeb7.0/deployment/jcyweb
ENTRYPOINT /opt/tongtech/TongWeb7.0/bin/startserver.sh
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或