Skip to content

I
ibzrt
提交 76d1dcc3 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 d01026b3
隐藏空白字符变更
内嵌 并排
正在显示 包含 246 行增加 和 8 行删除
ibzrt-app/ibzrt-app-web/pom.xml
浏览文件 @ 76d1dcc3
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<artifactId>ibzrt-app-web</artifactId> <artifactId>ibzrt-app-web</artifactId>
<name>Ibzrt Gateway Web</name> <name>Ibzrt Gateway Web</name>
<description>Ibzrt Web</description> <description>Ibzrt 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>ibzrt-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>
......
ibzrt-app/ibzrt-app-web/src/main/dockerwar/Dockerfile 0 → 100644
浏览文件 @ 76d1dcc3
FROM registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
ENV TZ Asia/Shanghai
ENV LANG C.UTF-8
WORKDIR /opt/tongtech
ADD ibzrt-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 ibzrt-app-web.war -d ./TongWeb7.0/deployment/jcyweb
ENTRYPOINT /opt/tongtech/TongWeb7.0/bin/startserver.sh
ibzrt-core/src/main/resources/sysmodel/ibzrt.json
浏览文件 @ 76d1dcc3
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
"nullable":0, "nullable":0,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":300,
"key_field":0, "key_field":0,
"show_order":3, "show_order":3,
"major_field":1 "major_field":1
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
"nullable":0, "nullable":0,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":300,
"key_field":0, "key_field":0,
"show_order":3, "show_order":3,
"major_field":0 "major_field":0
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
"nullable":0, "nullable":0,
"physical_field":1, "physical_field":1,
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":300,
"key_field":0, "key_field":0,
"show_order":5, "show_order":5,
"major_field":1 "major_field":1
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,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
......
ibzrt-provider/ibzrt-provider-api/pom.xml
浏览文件 @ 76d1dcc3
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<artifactId>ibzrt-provider-api</artifactId> <artifactId>ibzrt-provider-api</artifactId>
<name>Ibzrt Microservice api</name> <name>Ibzrt 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>ibzrt-provider-api</finalName>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<mainClass>cn.ibizlab.api.ibzrtapiApplication</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>
ibzrt-provider/ibzrt-provider-api/src/main/dockerwar/Dockerfile 0 → 100644
浏览文件 @ 76d1dcc3
FROM registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
ENV TZ Asia/Shanghai
ENV LANG C.UTF-8
WORKDIR /opt/tongtech
ADD ibzrt-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 ibzrt-provider-api.war -d ./TongWeb7.0/deployment/jcyweb
ENTRYPOINT /opt/tongtech/TongWeb7.0/bin/startserver.sh
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.java
浏览文件 @ 76d1dcc3
...@@ -60,7 +60,7 @@ public class DictCatalogDTO extends DTOBase implements Serializable { ...@@ -60,7 +60,7 @@ public class DictCatalogDTO extends DTOBase implements Serializable {
@JSONField(name = "name") @JSONField(name = "name")
@JsonProperty("name") @JsonProperty("name")
@NotBlank(message = "[名称]不允许为空!") @NotBlank(message = "[名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("名称") @ApiModelProperty("名称")
private String name; private String name;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/DictOptionDTO.java
浏览文件 @ 76d1dcc3
...@@ -60,7 +60,7 @@ public class DictOptionDTO extends DTOBase implements Serializable { ...@@ -60,7 +60,7 @@ public class DictOptionDTO extends DTOBase implements Serializable {
@JSONField(name = "catalog_name") @JSONField(name = "catalog_name")
@JsonProperty("catalog_name") @JsonProperty("catalog_name")
@NotBlank(message = "[目录]不允许为空!") @NotBlank(message = "[目录]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("目录") @ApiModelProperty("目录")
private String catalogName; private String catalogName;
...@@ -82,7 +82,7 @@ public class DictOptionDTO extends DTOBase implements Serializable { ...@@ -82,7 +82,7 @@ public class DictOptionDTO extends DTOBase implements Serializable {
@JSONField(name = "label") @JSONField(name = "label")
@JsonProperty("label") @JsonProperty("label")
@NotBlank(message = "[名称]不允许为空!") @NotBlank(message = "[名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("名称") @ApiModelProperty("名称")
private String label; private String label;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/JobsInfoDTO.java
浏览文件 @ 76d1dcc3
...@@ -152,7 +152,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable { ...@@ -152,7 +152,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "remark") @JSONField(name = "remark")
@JsonProperty("remark") @JsonProperty("remark")
@Size(min = 0, max = 30, message = "内容长度必须小于等于[30]") @Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或