提交 f20a8266 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 f089fef5
......@@ -38,6 +38,11 @@
git clone -b master $para2 ehr/
export NODE_OPTIONS=--max-old-space-size=4096
cd ehr/
mvn clean package -Pwebapi
cd ehr-provider/ehr-provider-webapi
mvn -Pwebapi docker:build
mvn -Pwebapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-provider-webapi.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -309,7 +309,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
@JsonProperty("zgxllx")
private String zgxllx;
/**
* 中建系统工作时间
* 建筑系统工作时间
*/
@TableField(value = "tozjdate")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
......@@ -410,7 +410,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
@JsonProperty("pimmajorsetypename")
private String pimmajorsetypename;
/**
* 中建系统工作年限
* 建筑系统工作年限
*/
@TableField(value = "zjxtgznx")
@JSONField(name = "zjxtgznx")
......@@ -817,7 +817,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
this.modify("zgxllx",zgxllx);
}
/**
* 设置 [中建系统工作时间]
* 设置 [建筑系统工作时间]
*/
public void setTozjdate(Timestamp tozjdate){
this.tozjdate = tozjdate ;
......@@ -915,7 +915,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
this.modify("pimmajorsetypename",pimmajorsetypename);
}
/**
* 设置 [中建系统工作年限]
* 设置 [建筑系统工作年限]
*/
public void setZjxtgznx(Double zjxtgznx){
this.zjxtgznx = zjxtgznx ;
......
......@@ -184,7 +184,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
@JsonProperty("xxxz")
private String xxxz;
/**
* 中建系统工作时间
* 建筑系统工作时间
*/
@TableField(value = "tozjdate")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
......@@ -319,7 +319,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
@JsonProperty("dbdwsj")
private Timestamp dbdwsj;
/**
* 中建系统工作年限
* 建筑系统工作年限
*/
@TableField(value = "zjxtgznx")
@JSONField(name = "zjxtgznx")
......@@ -484,7 +484,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
this.modify("xxxz",xxxz);
}
/**
* 设置 [中建系统工作时间]
* 设置 [建筑系统工作时间]
*/
public void setTozjdate(Timestamp tozjdate){
this.tozjdate = tozjdate ;
......@@ -582,7 +582,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
this.modify("dbdwsj",dbdwsj);
}
/**
* 设置 [中建系统工作年限]
* 设置 [建筑系统工作年限]
*/
public void setZjxtgznx(Double zjxtgznx){
this.zjxtgznx = zjxtgznx ;
......
......@@ -861,7 +861,7 @@ public class PIMPERSON extends EntityMP implements Serializable {
@JsonProperty("orgsectorid")
private String orgsectorid;
/**
* 到中建系统时间
* 到建筑系统时间
*/
@TableField(value = "tozjdate")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
......@@ -1918,7 +1918,7 @@ public class PIMPERSON extends EntityMP implements Serializable {
this.modify("gwksrq",gwksrq);
}
/**
* 设置 [到中建系统时间]
* 设置 [到建筑系统时间]
*/
public void setTozjdate(Timestamp tozjdate){
this.tozjdate = tozjdate ;
......
......@@ -267,7 +267,7 @@ public class PCMDETAILSearchContext extends QueryWrapperContext<PCMDETAIL> {
}
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd")
private Timestamp n_tozjdate_like;//[中建系统工作时间]
private Timestamp n_tozjdate_like;//[建筑系统工作时间]
public void setN_tozjdate_like(Timestamp n_tozjdate_like) {
this.n_tozjdate_like = n_tozjdate_like;
if(!ObjectUtils.isEmpty(this.n_tozjdate_like)){
......@@ -369,7 +369,7 @@ public class PCMDETAILSearchContext extends QueryWrapperContext<PCMDETAIL> {
this.getSelectCond().like("pimmajorsetypename", n_pimmajorsetypename_like);
}
}
private Double n_zjxtgznx_like;//[中建系统工作年限]
private Double n_zjxtgznx_like;//[建筑系统工作年限]
public void setN_zjxtgznx_like(Double n_zjxtgznx_like) {
this.n_zjxtgznx_like = n_zjxtgznx_like;
if(!ObjectUtils.isEmpty(this.n_zjxtgznx_like)){
......
因为 它太大了无法显示 源差异 。您可以改为 查看blob
因为 它太大了无法显示 源差异 。您可以改为 查看blob
......@@ -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 /ehr-provider-parttimeperson.jar
EXPOSE 8081
EXPOSE 5080
ADD ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar
......@@ -3,9 +3,23 @@ services:
ehr-provider-parttimeperson:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest
ports:
- "8081:8081"
- "5080:5080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
mode: replicated
replicas: 1
......
......@@ -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 /ehr-provider-saasadmin.jar
EXPOSE 8081
EXPOSE 5080
ADD ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar
......@@ -3,9 +3,23 @@ services:
ehr-provider-saasadmin:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest
ports:
- "8081:8081"
- "5080:5080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
mode: replicated
replicas: 1
......
......@@ -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 /ehr-provider-specialrole.jar
EXPOSE 8081
EXPOSE 5080
ADD ehr-provider-specialrole.jar /ehr-provider-specialrole.jar
......@@ -3,9 +3,23 @@ services:
ehr-provider-specialrole:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest
ports:
- "8081:8081"
- "5080:5080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
mode: replicated
replicas: 1
......
......@@ -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 /ehr-provider-webapi.jar
EXPOSE 8081
EXPOSE 5080
ADD ehr-provider-webapi.jar /ehr-provider-webapi.jar
......@@ -3,9 +3,23 @@ services:
ehr-provider-webapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest
ports:
- "8081:8081"
- "5080:5080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
mode: replicated
replicas: 1
......
......@@ -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 /ehr-provider-wfcallback.jar
EXPOSE 8081
EXPOSE 5080
ADD ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar
......@@ -3,9 +3,23 @@ services:
ehr-provider-wfcallback:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest
ports:
- "8081:8081"
- "5080:5080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
mode: replicated
replicas: 1
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册