Skip to content

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

zhouweidong 部署微服务应用 [ibiz-rt，ibizlab-runtime]

上级 5d7740a0
隐藏空白字符变更
内嵌 并排
正在显示 包含 284 行增加 和 43 行删除
app_Web/src/locale/lanres/entities/sys-department/sys-department_en_US_base.ts
浏览文件 @ 19c0ba08
......@@ -20,6 +20,7 @@ function getLocaleResourceBase(){
parentdeptname: commonLogic.appcommonhandle("上级部门",null),
createdate: commonLogic.appcommonhandle("{0}[{1}] relational data [{2}] cannot be deleted!",null),
updatedate: commonLogic.appcommonhandle("The [{0}] value is not a character type",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
},
views: {
pickupgridview: {
......@@ -75,6 +76,7 @@ function getLocaleResourceBase(){
leaderid: commonLogic.appcommonhandle("分管领导标识",null),
leadername: commonLogic.appcommonhandle("分管领导",null),
showorder: commonLogic.appcommonhandle("排序",null),
isvalid: commonLogic.appcommonhandle("启用",null),
createdate: commonLogic.appcommonhandle("{0}[{1}] relational data [{2}] cannot be deleted!",null),
updatedate: commonLogic.appcommonhandle("The [{0}] value is not a character type",null),
},
......
app_Web/src/locale/lanres/entities/sys-department/sys-department_zh_CN_base.ts
浏览文件 @ 19c0ba08
......@@ -20,6 +20,7 @@ function getLocaleResourceBase(){
parentdeptname: commonLogic.appcommonhandle("上级部门",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
},
views: {
pickupgridview: {
......@@ -75,6 +76,7 @@ function getLocaleResourceBase(){
leaderid: commonLogic.appcommonhandle("分管领导标识",null),
leadername: commonLogic.appcommonhandle("分管领导",null),
showorder: commonLogic.appcommonhandle("排序",null),
isvalid: commonLogic.appcommonhandle("启用",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
},
......
app_Web/src/locale/lanres/entities/sys-organization/sys-organization_en_US_base.ts
浏览文件 @ 19c0ba08
......@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
enable: commonLogic.appcommonhandle("the workflow instance current processing step is invalid",null),
createdate: commonLogic.appcommonhandle("Print",null),
updatedate: commonLogic.appcommonhandle("Actor",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
},
views: {
pickupgridview: {
......@@ -61,6 +62,7 @@ function getLocaleResourceBase(){
shortname: commonLogic.appcommonhandle("Cancel",null),
showorder: commonLogic.appcommonhandle("排序",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
isvalid: commonLogic.appcommonhandle("启用",null),
createdate: commonLogic.appcommonhandle("Print",null),
updatedate: commonLogic.appcommonhandle("Actor",null),
},
......
app_Web/src/locale/lanres/entities/sys-organization/sys-organization_zh_CN_base.ts
浏览文件 @ 19c0ba08
......@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
enable: commonLogic.appcommonhandle("逻辑有效",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
},
views: {
pickupgridview: {
......@@ -61,6 +62,7 @@ function getLocaleResourceBase(){
shortname: commonLogic.appcommonhandle("单位简称",null),
showorder: commonLogic.appcommonhandle("排序",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
isvalid: commonLogic.appcommonhandle("启用",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
},
......
app_Web/src/widgets/sys-department/dept-tree-treeview/dept-tree-treeview-model.ts
浏览文件 @ 19c0ba08
......@@ -66,6 +66,9 @@ export default class DeptTreeModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
app_Web/src/widgets/sys-department/main-form/main-form-base.vue
浏览文件 @ 19c0ba08
......@@ -119,6 +119,27 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.isvalid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='isvalid' :itemRules="this.rules().isvalid" class='' :caption="$t('entities.sysdepartment.main_form.details.isvalid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.isvalid.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.isvalid"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.isvalid.disabled"
valueType="number"
style="width:100px;width: 100px;"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'>
</dropdown-list>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.sysdepartment.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -548,6 +569,7 @@ export default class MainBase extends Vue implements ControlInterface {
leaderid: null,
leadername: null,
showorder: null,
isvalid: null,
createdate: null,
updatedate: null,
sysdepartment:null,
......@@ -637,6 +659,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'change' },
{ required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'blur' },
],
isvalid: [
{ required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'change' },
{ required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'blur' },
],
createdate: [
{ required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
{ required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
......@@ -795,6 +821,8 @@ export default class MainBase extends Vue implements ControlInterface {
leadername: new FormItemModel({ caption: '分管领导', detailType: 'FORMITEM', name: 'leadername', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
showorder: new FormItemModel({ caption: '排序', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
isvalid: new FormItemModel({ caption: '启用', detailType: 'FORMITEM', name: 'isvalid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
createdate: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -1054,6 +1082,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'showorder', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 isvalid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.isvalid')
onIsvalidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'isvalid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 createdate 值
*
......@@ -1162,6 +1202,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
......
app_Web/src/widgets/sys-department/main-form/main-form-model.ts
浏览文件 @ 19c0ba08
......@@ -120,6 +120,11 @@ export default class MainModel {
prop: 'showorder',
dataType: 'INT',
},
{
name: 'isvalid',
prop: 'isvalid',
dataType: 'YESNO',
},
{
name: 'createdate',
prop: 'createdate',
......
app_Web/src/widgets/sys-department/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 19c0ba08
......@@ -66,6 +66,9 @@ export default class MPickupViewpickupviewpanelModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
app_Web/src/widgets/sys-department/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 19c0ba08
......@@ -66,6 +66,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
app_Web/src/widgets/sys-department/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts
浏览文件 @ 19c0ba08
......@@ -66,6 +66,9 @@ export default class TreeExpViewtreeexpbarModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
app_Web/src/widgets/sys-organization/main-form/main-form-base.vue
浏览文件 @ 19c0ba08
......@@ -77,6 +77,27 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.isvalid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='isvalid' :itemRules="this.rules().isvalid" class='' :caption="$t('entities.sysorganization.main_form.details.isvalid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.isvalid.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.isvalid"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.isvalid.disabled"
valueType="number"
style="width:100px;width: 100px;"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'>
</dropdown-list>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.sysorganization.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -501,6 +522,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname: null,
showorder: null,
porgid: null,
isvalid: null,
createdate: null,
updatedate: null,
sysorganization:null,
......@@ -578,6 +600,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'change' },
{ required: this.detailsModel.showorder.required, type: 'number', message: '排序 值不能为空', trigger: 'blur' },
],
isvalid: [
{ required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'change' },
{ required: this.detailsModel.isvalid.required, type: 'number', message: '启用 值不能为空', trigger: 'blur' },
],
createdate: [
{ required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
{ required: this.detailsModel.createdate.required, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
......@@ -726,6 +752,8 @@ export default class MainBase extends Vue implements ControlInterface {
showorder: new FormItemModel({ caption: '排序', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
porgid: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'porgid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
isvalid: new FormItemModel({ caption: '启用', detailType: 'FORMITEM', name: 'isvalid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
createdate: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -925,6 +953,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'porgid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 isvalid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.isvalid')
onIsvalidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'isvalid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 createdate 值
*
......@@ -1021,6 +1061,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
......
app_Web/src/widgets/sys-organization/main-form/main-form-model.ts
浏览文件 @ 19c0ba08
......@@ -95,6 +95,11 @@ export default class MainModel {
prop: 'parentorgid',
dataType: 'PICKUP',
},
{
name: 'isvalid',
prop: 'isvalid',
dataType: 'YESNO',
},
{
name: 'createdate',
prop: 'createdate',
......
app_Web/src/widgets/sys-organization/org-tree-treeview/org-tree-treeview-model.ts
浏览文件 @ 19c0ba08
......@@ -51,6 +51,9 @@ export default class OrgTreeModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
app_Web/src/widgets/sys-organization/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 19c0ba08
......@@ -51,6 +51,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
app_Web/src/widgets/sys-organization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts
浏览文件 @ 19c0ba08
......@@ -51,6 +51,9 @@ export default class TreeExpViewtreeexpbarModel {
{
name: 'updatedate',
},
{
name: 'isvalid',
},
]
}
......
config.xml
浏览文件 @ 19c0ba08
......@@ -37,6 +37,11 @@
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
浏览文件 @ 19c0ba08
......@@ -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 8080
EXPOSE 30000
ADD ibzrt-app-web.jar /ibzrt-app-web.jar
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @ 19c0ba08
......@@ -3,9 +3,23 @@ services:
ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports:
- "8080:8080"
- "30000:30000"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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.100.243:8848
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy:
resources:
limits:
......@@ -14,6 +28,10 @@ services:
memory: 400M
mode: replicated
replicas: 1
restart_policy:
condition: on-failure
max_attempts: 3
window: 120s
volumes:
- "nfs:/app/file"
......
ibzrt-boot/src/main/resources/logback-spring.xml
浏览文件 @ 19c0ba08
......@@ -20,18 +20,17 @@
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_PATH}/ibzrt.%d{yyyy-MM-dd}.log</FileNamePattern>
<FileNamePattern>${LOG_PATH}/ibzrt.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件最大的大小-->
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<!--日志文件最大的大小-->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>100MB</MaxFileSize>
</triggeringPolicy>
</appender>
<!-- 日志输出级别 -->
<root level="INFO">
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/SysDepartment.java
浏览文件 @ 19c0ba08
......@@ -160,6 +160,14 @@ public class SysDepartment extends EntityClient implements Serializable {
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 启用标识
*/
@DEField(defaultValue = "1")
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/**
*
......@@ -258,6 +266,14 @@ public class SysDepartment extends EntityClient implements Serializable {
this.modify("leadername",leadername);
}
/**
* 设置 [启用标识]
*/
public void setIsvalid(Integer isvalid) {
this.isvalid = isvalid ;
this.modify("isvalid",isvalid);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
* @param targetEntity 目标数据对象
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/SysOrganization.java
浏览文件 @ 19c0ba08
......@@ -125,6 +125,14 @@ public class SysOrganization extends EntityClient implements Serializable {
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 启用标识
*/
@DEField(defaultValue = "1")
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/**
*
......@@ -191,6 +199,14 @@ public class SysOrganization extends EntityClient implements Serializable {
this.modify("domains",domains);
}
/**
* 设置 [启用标识]
*/
public void setIsvalid(Integer isvalid) {
this.isvalid = isvalid ;
this.modify("isvalid",isvalid);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
* @param targetEntity 目标数据对象
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/filter/SysDepartmentSearchContext.java
浏览文件 @ 19c0ba08
......@@ -43,6 +43,8 @@ public class SysDepartmentSearchContext extends SearchContextBase {
private String n_pdeptname_like;//[上级部门]
private Integer n_isvalid_eq;//[启用标识]
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/filter/SysOrganizationSearchContext.java
浏览文件 @ 19c0ba08
......@@ -43,6 +43,8 @@ public class SysOrganizationSearchContext extends SearchContextBase {
private String n_porgname_like;//[上级单位]
private Integer n_isvalid_eq;//[启用标识]
}
ibzrt-core/src/main/resources/sysmodel/ibzrt.json
浏览文件 @ 19c0ba08
......@@ -1662,6 +1662,20 @@
"key_field":0,
"show_order":19,
"major_field":0
},
{
"fieldname":"ISVALID" ,
"codename":"IsValid",
"field_logic_name":"启用标识",
"entity_name":"SysDepartment",
"field_type":"YESNO",
"dict":"YesNo",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":1000,
"major_field":0
}
],
"subEntitys":[
......@@ -2847,6 +2861,20 @@
"key_field":0,
"show_order":19,
"major_field":0
},
{
"fieldname":"ISVALID" ,
"codename":"IsValid",
"field_logic_name":"启用标识",
"entity_name":"SysOrganization",
"field_type":"YESNO",
"dict":"YesNo",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":1000,
"major_field":0
}
],
"subEntitys":[
......
ibzrt-dependencies/pom.xml
浏览文件 @ 19c0ba08
......@@ -261,6 +261,7 @@
<version>${baomidou-jobs.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -346,8 +347,6 @@
</dependency>
</dependencies>
</project>
ibzrt-provider/ibzrt-provider-api/src/main/docker/ibzrt-provider-api.yaml
浏览文件 @ 19c0ba08
......@@ -14,6 +14,10 @@ services:
memory: 400M
mode: replicated
replicas: 1
restart_policy:
condition: on-failure
max_attempts: 3
window: 120s
volumes:
- "nfs:/app/file"
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysDepartmentDTO.java
浏览文件 @ 19c0ba08
......@@ -181,6 +181,14 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 属性 [ISVALID]
*
*/
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/**
* 设置 [DEPTCODE]
......@@ -262,6 +270,14 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
this.modify("leadername",leadername);
}
/**
* 设置 [ISVALID]
*/
public void setIsvalid(Integer isvalid){
this.isvalid = isvalid ;
this.modify("isvalid",isvalid);
}
}
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysOrganizationDTO.java
浏览文件 @ 19c0ba08
......@@ -134,6 +134,14 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 属性 [ISVALID]
*
*/
@JSONField(name = "isvalid")
@JsonProperty("isvalid")
private Integer isvalid;
/**
* 设置 [ORGCODE]
......@@ -183,6 +191,14 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
this.modify("domains",domains);
}
/**
* 设置 [ISVALID]
*/
public void setIsvalid(Integer isvalid){
this.isvalid = isvalid ;
this.modify("isvalid",isvalid);
}
}
......
ibzrt-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ 19c0ba08
......@@ -13,6 +13,7 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import java.io.InputStream;
import java.util.*;
......@@ -25,58 +26,55 @@ import java.util.*;
@ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
public class PermissionSyncJob implements ApplicationRunner {
@Autowired
@Lazy
private IBZUAAFeignClient client;
@Value("${ibiz.systemid:ibzrt}")
private String systemId;
@Value("${ibiz.systemname:ibzrt}")
private String systemName;
@Autowired
@Lazy
IBZLiteFeignClient liteFeignClient;
private IBZUAAFeignClient uaaClient;
@Autowired
@Lazy
IBZLiteFeignClient liteClient;
@Override
public void run(ApplicationArguments args) {
try {
Thread.sleep(10000);
InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力
String permissionResult = IOUtils.toString(permission,"UTF-8");
JSONObject system= new JSONObject();
system.put("pssystemid",systemId);
system.put("pssystemname",systemName);
system.put("sysstructure",JSONObject.parseObject(permissionResult));
system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
if(client.syncSysAuthority(system)) {
log.info("向[UAA]同步系统资源成功");
}else{
log.error("向[UAA]同步系统资源失败");
InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //权限资源
if (!ObjectUtils.isEmpty(permission)) {
String strPermission = IOUtils.toString(permission, "UTF-8");
JSONObject system = new JSONObject() {{
put("pssystemid", systemId);
put("pssystemname", systemName);
put("sysstructure", JSONObject.parseObject(strPermission));
put("md5check", DigestUtils.md5DigestAsHex(strPermission.getBytes()));
}};
if (uaaClient.syncSysAuthority(system)) {
log.info("向[uaa]同步系统资源成功");
} else {
log.error("向[uaa]同步系统资源失败");
}
}
}
catch (Exception ex) {
log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
} catch (Exception ex) {
log.error("向[uaa]同步系统资源失败，请检查[uaa]服务是否正常运行! {}", ex.getMessage());
}
try {
InputStream sysModel = this.getClass().getResourceAsStream("/sysmodel/ibzrt.json"); //获取当前系统所有实体资源能力
String strSysModel = IOUtils.toString(sysModel,"UTF-8");
if(liteFeignClient.syncSysModel(JSONObject.parseObject(strSysModel))) {
log.info("向[lite]同步系统模型成功");
}else{
log.error("向[lite]同步系统模型失败");
InputStream model = this.getClass().getResourceAsStream("/sysmodel/ibzrt.json"); //系统模型
if (!ObjectUtils.isEmpty(model)) {
String strModel = IOUtils.toString(model, "UTF-8");
if (liteClient.syncSysModel(JSONObject.parseObject(strModel))) {
log.info("向[lite]同步模型成功");
} else {
log.error("向[lite]同步模型失败");
}
}
} catch (Exception ex) {
log.error("向[lite]同步系统模型失败，请检查[lite]服务是否正常运行! {}", ex.getMessage());
}
catch (Exception ex) {
log.error(String.format("向[lite]同步系统模型失败，请检查[lite]服务是否正常! [%s]",ex));
}
}
}
\ No newline at end of file
ibzrt-util/src/main/resources/application-sys.yml
浏览文件 @ 19c0ba08
......@@ -107,3 +107,4 @@ server:
min-response-size: 10240
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或