ibizdev提交

app_EHRPim/src/locale/lanres/pcmdetail/pcmdetail_en_US.ts

@@ -38,7 +38,7 @@ export default {
     updatedate: '更新时间',
     enable: '逻辑有效标志',
     zgxllx: '最高学历学习形式',
-    tozjdate: '中建系统工作时间',
+    tozjdate: '建筑系统工作时间',
     jxkhcj: '绩效考核成绩（近两年）',
     dyxljssj: '第一学历毕业时间',
     yglx: '员工类型',
@@ -52,7 +52,7 @@ export default {
     rank: '职级',
     zcbh: '职称编号',
     pimmajorsetypename: '所属业务系统',
-    zjxtgznx: '中建系统工作年限',
+    zjxtgznx: '建筑系统工作年限',
     gznx: '工作年限',
     xb: '性别',
     createdate: '建立时间',
@@ -154,9 +154,9 @@ export default {
 			bdwgznx: "本单位工作年限", 
 			bjgznx: "局工作年限", 
 			careername: "专业技术资格（职称）", 
-			zjxtgznx: "中建系统工作年限", 
+			zjxtgznx: "建筑系统工作年限", 
 			cjgzsj: "参加工作时间", 
-			tozjdate: "中建系统工作时间", 
+			tozjdate: "建筑系统工作时间", 
 			dbdwsj: "本单位工作时间", 
 			rank: "职级", 
 			rdsj: "入党时间", 
@@ -217,8 +217,8 @@ export default {
 			zgxlsxzy: "最高学历所学专业",
 			cjgzsj: "参加工作时间",
 			gznx: "工作年限",
-			tozjdate: "中建系统工作时间",
-			zjxtgznx: "中建系统工作年限",
+			tozjdate: "建筑系统工作时间",
+			zjxtgznx: "建筑系统工作年限",
 			dzjbjsj: "局工作时间",
 			bjgznx: "局工作年限",
 			dbdwsj: "本单位工作时间",

app_EHRPim/src/locale/lanres/pcmdetail/pcmdetail_zh_CN.ts

@@ -37,7 +37,7 @@ export default {
     updatedate: '更新时间',
     enable: '逻辑有效标志',
     zgxllx: '最高学历学习形式',
-    tozjdate: '中建系统工作时间',
+    tozjdate: '建筑系统工作时间',
     jxkhcj: '绩效考核成绩（近两年）',
     dyxljssj: '第一学历毕业时间',
     yglx: '员工类型',
@@ -51,7 +51,7 @@ export default {
     rank: '职级',
     zcbh: '职称编号',
     pimmajorsetypename: '所属业务系统',
-    zjxtgznx: '中建系统工作年限',
+    zjxtgznx: '建筑系统工作年限',
     gznx: '工作年限',
     xb: '性别',
     createdate: '建立时间',
@@ -153,9 +153,9 @@ export default {
 			bdwgznx: '本单位工作年限', 
 			bjgznx: '局工作年限', 
 			careername: '专业技术资格（职称）', 
-			zjxtgznx: '中建系统工作年限', 
+			zjxtgznx: '建筑系统工作年限', 
 			cjgzsj: '参加工作时间', 
-			tozjdate: '中建系统工作时间', 
+			tozjdate: '建筑系统工作时间', 
 			dbdwsj: '本单位工作时间', 
 			rank: '职级', 
 			rdsj: '入党时间', 
@@ -216,8 +216,8 @@ export default {
 			zgxlsxzy: '最高学历所学专业',
 			cjgzsj: '参加工作时间',
 			gznx: '工作年限',
-			tozjdate: '中建系统工作时间',
-			zjxtgznx: '中建系统工作年限',
+			tozjdate: '建筑系统工作时间',
+			zjxtgznx: '建筑系统工作年限',
 			dzjbjsj: '局工作时间',
 			bjgznx: '局工作年限',
 			dbdwsj: '本单位工作时间',

app_EHRPim/src/locale/lanres/pimeducation/pimeducation_en_US.ts

@@ -21,7 +21,7 @@ export default {
     xwz: '学位证',
     xllx: '学习形式',
     xxxz: '学校性质',
-    tozjdate: '中建系统工作时间',
+    tozjdate: '建筑系统工作时间',
     jlglbh: '记录管理编号',
     jlspzt: '记录审批状态',
     btz: '毕业证',
@@ -39,7 +39,7 @@ export default {
     createdate: '建立时间',
     xl: '学历',
     dbdwsj: '本单位工作时间',
-    zjxtgznx: '中建系统工作年限',
+    zjxtgznx: '建筑系统工作年限',
     bjgznx: '局工作年限',
     ormorgid: '组织标识',
     pimpersonname: '员工名称',

app_EHRPim/src/locale/lanres/pimeducation/pimeducation_zh_CN.ts

@@ -20,7 +20,7 @@ export default {
     xwz: '学位证',
     xllx: '学习形式',
     xxxz: '学校性质',
-    tozjdate: '中建系统工作时间',
+    tozjdate: '建筑系统工作时间',
     jlglbh: '记录管理编号',
     jlspzt: '记录审批状态',
     btz: '毕业证',
@@ -38,7 +38,7 @@ export default {
     createdate: '建立时间',
     xl: '学历',
     dbdwsj: '本单位工作时间',
-    zjxtgznx: '中建系统工作年限',
+    zjxtgznx: '建筑系统工作年限',
     bjgznx: '局工作年限',
     ormorgid: '组织标识',
     pimpersonname: '员工名称',

app_EHRPim/src/locale/lanres/pimperson/pimperson_en_US.ts

@@ -114,7 +114,7 @@ export default {
     cjgzsj: '参加工作时间',
     gwksrq: '岗位开始日期',
     orgsectorid: '部门ID',
-    tozjdate: '到中建系统时间',
+    tozjdate: '到建筑系统时间',
     zjhm: '证件号码',
     pimpersonid: '人员信息标识',
     blacklistreasons: '黑名单原因',
@@ -450,7 +450,7 @@ export default {
 			gw: "岗位", 
 			zj: "专家类型", 
 			cjgzsj: "参加工作时间", 
-			tozjdate: "到中建系统时间", 
+			tozjdate: "到建筑系统时间", 
 			dzjbjsj: "到局时间", 
 			dbdwsj: "到本单位时间", 
 			gzzt: "挂职状态", 
@@ -536,7 +536,7 @@ export default {
 			postaladdress: "通讯地址", 
 			rdsj1: "入党时间", 
 			rtsj: "入团时间", 
-			tozjdate: "到中建系统时间", 
+			tozjdate: "到建筑系统时间", 
 			dzjbjsj: "到局时间", 
 			rzqd: "入职渠道", 
 			gzzt: "挂职状态", 
@@ -740,7 +740,7 @@ export default {
 			rank: "职级", 
 			zj: "专家类型", 
 			cjgzsj: "参加工作时间", 
-			tozjdate: "到中建系统时间", 
+			tozjdate: "到建筑系统时间", 
 			dzjbjsj: "到局时间", 
 			dbdwsj: "到本单位时间", 
 			pimpersonid: "人员信息标识", 

app_EHRPim/src/locale/lanres/pimperson/pimperson_zh_CN.ts

@@ -113,7 +113,7 @@ export default {
     cjgzsj: '参加工作时间',
     gwksrq: '岗位开始日期',
     orgsectorid: '部门ID',
-    tozjdate: '到中建系统时间',
+    tozjdate: '到建筑系统时间',
     zjhm: '证件号码',
     pimpersonid: '人员信息标识',
     blacklistreasons: '黑名单原因',
@@ -449,7 +449,7 @@ export default {
 			gw: '岗位', 
 			zj: '专家类型', 
 			cjgzsj: '参加工作时间', 
-			tozjdate: '到中建系统时间', 
+			tozjdate: '到建筑系统时间', 
 			dzjbjsj: '到局时间', 
 			dbdwsj: '到本单位时间', 
 			gzzt: '挂职状态', 
@@ -535,7 +535,7 @@ export default {
 			postaladdress: '通讯地址', 
 			rdsj1: '入党时间', 
 			rtsj: '入团时间', 
-			tozjdate: '到中建系统时间', 
+			tozjdate: '到建筑系统时间', 
 			dzjbjsj: '到局时间', 
 			rzqd: '入职渠道', 
 			gzzt: '挂职状态', 
@@ -739,7 +739,7 @@ export default {
 			rank: '职级', 
 			zj: '专家类型', 
 			cjgzsj: '参加工作时间', 
-			tozjdate: '到中建系统时间', 
+			tozjdate: '到建筑系统时间', 
 			dzjbjsj: '到局时间', 
 			dbdwsj: '到本单位时间', 
 			pimpersonid: '人员信息标识', 

app_EHRPim/src/mock/entity/pimeducations/pimeducations.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null}
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null}
 ];
 
 

app_EHRPim/src/widgets/pcmdetail/main-form/main-form-base.vue

@@ -1046,10 +1046,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '专业技术资格（职称） 值不能为空', trigger: 'blur' },
         ],
         zjxtgznx: [
-            { type: 'number', message: '中建系统工作年限 值必须为数值类型', trigger: 'change' },
-            { type: 'number', message: '中建系统工作年限 值必须为数值类型', trigger: 'blur' },
-            { required: false, type: 'number', message: '中建系统工作年限 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '中建系统工作年限 值不能为空', trigger: 'blur' },
+            { type: 'number', message: '建筑系统工作年限 值必须为数值类型', trigger: 'change' },
+            { type: 'number', message: '建筑系统工作年限 值必须为数值类型', trigger: 'blur' },
+            { required: false, type: 'number', message: '建筑系统工作年限 值不能为空', trigger: 'change' },
+            { required: false, type: 'number', message: '建筑系统工作年限 值不能为空', trigger: 'blur' },
         ],
         cjgzsj: [
             { type: 'string', message: '参加工作时间 值必须为字符串类型', trigger: 'change' },
@@ -1058,10 +1058,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '参加工作时间 值不能为空', trigger: 'blur' },
         ],
         tozjdate: [
-            { type: 'string', message: '中建系统工作时间 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '中建系统工作时间 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '中建系统工作时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '中建系统工作时间 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '建筑系统工作时间 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '建筑系统工作时间 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '建筑系统工作时间 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '建筑系统工作时间 值不能为空', trigger: 'blur' },
         ],
         dbdwsj: [
             { type: 'string', message: '本单位工作时间 值必须为字符串类型', trigger: 'change' },
@@ -1308,11 +1308,11 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         careername: new FormItemModel({ caption: '专业技术资格（职称）', detailType: 'FORMITEM', name: 'careername', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        zjxtgznx: new FormItemModel({ caption: '中建系统工作年限', detailType: 'FORMITEM', name: 'zjxtgznx', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        zjxtgznx: new FormItemModel({ caption: '建筑系统工作年限', detailType: 'FORMITEM', name: 'zjxtgznx', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         cjgzsj: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'cjgzsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        tozjdate: new FormItemModel({ caption: '中建系统工作时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        tozjdate: new FormItemModel({ caption: '建筑系统工作时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         dbdwsj: new FormItemModel({ caption: '本单位工作时间', detailType: 'FORMITEM', name: 'dbdwsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 

app_EHRPim/src/widgets/pcmdetail/main-grid/main-grid-base.vue

@@ -1303,14 +1303,14 @@ export default class MainBase extends Vue implements ControlInterface {
         },
         {
             name: 'tozjdate',
-            label: '中建系统工作时间',
+            label: '建筑系统工作时间',
             langtag: 'entities.pcmdetail.main_grid.columns.tozjdate',
             show: true,
             util: 'PX'
         },
         {
             name: 'zjxtgznx',
-            label: '中建系统工作年限',
+            label: '建筑系统工作年限',
             langtag: 'entities.pcmdetail.main_grid.columns.zjxtgznx',
             show: true,
             util: 'PX'

app_EHRPim/src/widgets/pimperson/read-ryinfo-form-form/read-ryinfo-form-form-base.vue

@@ -1150,10 +1150,10 @@ export default class ReadRYInfoFormBase extends Vue implements ControlInterface
             { required: false, type: 'string', message: '入团时间 值不能为空', trigger: 'blur' },
         ],
         tozjdate: [
-            { type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'blur' },
         ],
         dzjbjsj: [
             { type: 'string', message: '到局时间 值必须为字符串类型', trigger: 'change' },
@@ -1374,7 +1374,7 @@ export default class ReadRYInfoFormBase extends Vue implements ControlInterface
 , 
         rtsj: new FormItemModel({ caption: '入团时间', detailType: 'FORMITEM', name: 'rtsj', visible: false, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
 , 
-        tozjdate: new FormItemModel({ caption: '到中建系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
+        tozjdate: new FormItemModel({ caption: '到建筑系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
 , 
         dzjbjsj: new FormItemModel({ caption: '到局时间', detailType: 'FORMITEM', name: 'dzjbjsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
 , 

app_EHRPim/src/widgets/pimperson/ryinfo-form-form/ryinfo-form-form-base.vue

@@ -1263,10 +1263,10 @@ export default class RYInfoFormBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '参加工作时间 值不能为空', trigger: 'blur' },
         ],
         tozjdate: [
-            { type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'blur' },
         ],
         dzjbjsj: [
             { type: 'string', message: '到局时间 值必须为字符串类型', trigger: 'change' },
@@ -1511,7 +1511,7 @@ export default class RYInfoFormBase extends Vue implements ControlInterface {
 , 
         cjgzsj: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'cjgzsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        tozjdate: new FormItemModel({ caption: '到中建系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        tozjdate: new FormItemModel({ caption: '到建筑系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         dzjbjsj: new FormItemModel({ caption: '到局时间', detailType: 'FORMITEM', name: 'dzjbjsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 

config.xml

@@ -38,11 +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      
+      mvn clean package -Pehrpim
+      cd ehr-app/ehr-app-ehrpim
+      mvn -Pehrpim docker:build
+      mvn -Pehrpim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-app-ehrpim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ehr-app/ehr-app-ehr/src/main/docker/Dockerfile

@@ -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-app-ehr.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehr.jar /ehr-app-ehr.jar

ehr-app/ehr-app-ehr/src/main/docker/ehr-app-ehr.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehr:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrapp/src/main/docker/Dockerfile

@@ -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-app-ehrapp.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar

ehr-app/ehr-app-ehrapp/src/main/docker/ehr-app-ehrapp.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrapp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrhelp/src/main/docker/Dockerfile

@@ -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-app-ehrhelp.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar

ehr-app/ehr-app-ehrhelp/src/main/docker/ehr-app-ehrhelp.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrhelp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrmob/src/main/docker/Dockerfile

@@ -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-app-ehrmob.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar

ehr-app/ehr-app-ehrmob/src/main/docker/ehr-app-ehrmob.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrmob:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrorm/src/main/docker/Dockerfile

@@ -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-app-ehrorm.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar

ehr-app/ehr-app-ehrorm/src/main/docker/ehr-app-ehrorm.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrorm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrpcm/src/main/docker/Dockerfile

@@ -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-app-ehrpcm.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar

ehr-app/ehr-app-ehrpcm/src/main/docker/ehr-app-ehrpcm.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrpcm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrpcm2/src/main/docker/Dockerfile

@@ -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-app-ehrpcm2.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar

ehr-app/ehr-app-ehrpcm2/src/main/docker/ehr-app-ehrpcm2.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrpcm2:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrpim/src/main/docker/Dockerfile

@@ -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-app-ehrpim.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar

ehr-app/ehr-app-ehrpim/src/main/docker/ehr-app-ehrpim.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrpim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-ehrweb/src/main/docker/Dockerfile

@@ -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-app-ehrweb.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar

ehr-app/ehr-app-ehrweb/src/main/docker/ehr-app-ehrweb.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-ehrweb:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-app/ehr-app-web/src/main/docker/Dockerfile

@@ -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-app-web.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-web.jar /ehr-app-web.jar

ehr-app/ehr-app-web/src/main/docker/ehr-app-web.yaml

@@ -3,9 +3,23 @@ services:
   ehr-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=6092
+      - 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

ehr-provider/ehr-provider-parttimeperson/src/main/docker/Dockerfile

@@ -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 5080
+EXPOSE 8081
 
 ADD ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar

ehr-provider/ehr-provider-parttimeperson/src/main/docker/ehr-provider-parttimeperson.yaml

@@ -3,23 +3,9 @@ services:
   ehr-provider-parttimeperson:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     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

ehr-provider/ehr-provider-saasadmin/src/main/docker/Dockerfile

@@ -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 5080
+EXPOSE 8081
 
 ADD ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar

ehr-provider/ehr-provider-saasadmin/src/main/docker/ehr-provider-saasadmin.yaml

@@ -3,23 +3,9 @@ services:
   ehr-provider-saasadmin:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     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

ehr-provider/ehr-provider-specialrole/src/main/docker/Dockerfile

@@ -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 5080
+EXPOSE 8081
 
 ADD ehr-provider-specialrole.jar /ehr-provider-specialrole.jar

ehr-provider/ehr-provider-specialrole/src/main/docker/ehr-provider-specialrole.yaml

@@ -3,23 +3,9 @@ services:
   ehr-provider-specialrole:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     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

ehr-provider/ehr-provider-webapi/src/main/docker/Dockerfile

@@ -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 5080
+EXPOSE 8081
 
 ADD ehr-provider-webapi.jar /ehr-provider-webapi.jar

ehr-provider/ehr-provider-webapi/src/main/docker/ehr-provider-webapi.yaml

@@ -3,23 +3,9 @@ services:
   ehr-provider-webapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     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

ehr-provider/ehr-provider-wfcallback/src/main/docker/Dockerfile

@@ -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 5080
+EXPOSE 8081
 
 ADD ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar

ehr-provider/ehr-provider-wfcallback/src/main/docker/ehr-provider-wfcallback.yaml

@@ -3,23 +3,9 @@ services:
   ehr-provider-wfcallback:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     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