ibizdev提交

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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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-15 12:00:04","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","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 16:12:35","createman":"示例操作者","pimpersonname":null}
 ];
 
 

config.xml

@@ -38,11 +38,6 @@
 	  git clone -b master $para2 ehr/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ehr/
-      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 6092
+EXPOSE 8080
 
 ADD ehr-app-ehr.jar /ehr-app-ehr.jar

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehr:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehr/src/main/java/cn/ibizlab/ehr/ehr/config/EHRSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehr/src/main/resources/application-ehr-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehr/src/main/resources/application-ehr-prod.yml

 server:
-  port: 6092
-
+  port: 8080
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrapp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrapp/src/main/java/cn/ibizlab/ehr/ehrapp/config/EHRAppSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRAppSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRAppSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-prod.yml

 server:
-  port: 6092
-
+  port: 8080
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrhelp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrhelp/src/main/java/cn/ibizlab/ehr/ehrhelp/config/EHRHelpSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRHelpSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRHelpSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-prod.yml

 server:
-  port: 6092
-
+  port: 6082
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrmob:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrmob/src/main/java/cn/ibizlab/ehr/ehrmob/config/EHRMobSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRMobSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRMobSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-prod.yml

 server:
-  port: 6092
-
+  port: 6070
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrorm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrorm/src/main/java/cn/ibizlab/ehr/ehrorm/config/EHROrmSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHROrmSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHROrmSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-prod.yml

 server:
-  port: 6092
-
+  port: 6091
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrpcm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrpcm/src/main/java/cn/ibizlab/ehr/ehrpcm/config/EHRPcmSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRPcmSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRPcmSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-prod.yml

 server:
-  port: 6092
-
+  port: 6093
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrpcm2:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrpcm2/src/main/java/cn/ibizlab/ehr/ehrpcm2/config/EHRPcm2SecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRPcm2SecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRPcm2SecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-prod.yml

 server:
-  port: 6092
-
+  port: 8080
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrpim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrpim/src/main/java/cn/ibizlab/ehr/ehrpim/config/EHRPimSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRPimSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRPimSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-prod.yml

 server:
   port: 6092
-
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-ehrweb:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-ehrweb/src/main/java/cn/ibizlab/ehr/ehrweb/config/EHRWEBSecurityConfig.java

@@ -42,6 +42,9 @@ public class EHRWEBSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class EHRWEBSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-prod.yml

 server:
-  port: 6092
-
+  port: 8080
 #zuul网关路由设置
 zuul:
   routes:

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

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

@@ -3,11 +3,9 @@ services:
   ehr-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
     ports:
-      - "6092:6092"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1
@@ -15,4 +13,5 @@ services:
 networks:
   agent_network:
     driver: overlay
-    attachable: true
\ No newline at end of file
+    attachable: true
+

ehr-app/ehr-app-web/src/main/java/cn/ibizlab/ehr/web/config/WebSecurityConfig.java

@@ -42,6 +42,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ehr-app/ehr-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 6092
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ehr-app/ehr-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 6092
-
+  port: 8080
 #zuul网关路由设置
 zuul:
   routes:

ehr-boot/src/main/java/cn/ibizlab/ehr/config/DevBootSecurityConfig.java

@@ -41,6 +41,9 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -102,6 +105,8 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                     //放行登录请求
                    .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                    //放行注销请求
+                    .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                     // 文件操作
                    .antMatchers("/"+downloadpath+"/**").permitAll()
                    .antMatchers("/"+uploadpath).permitAll()

ehr-boot/src/main/resources/application-dev.yml

 server:
   port: 8080
 
-
-
 #zuul网关路由设置
 zuul:
   routes:

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCEDATE.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤日期]
  */
@@ -142,10 +145,7 @@ public class ATTENDANCEDATE extends EntityMP implements Serializable {
         this.day = day ;
         this.modify("day",day);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCEMREPORT.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤月报]
  */
@@ -222,10 +225,7 @@ public class ATTENDANCEMREPORT extends EntityMP implements Serializable {
         this.attendencesetupid = attendencesetupid ;
         this.modify("attendencesetupid",attendencesetupid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCEMREPORTMX.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤月报明细]
  */
@@ -710,10 +713,7 @@ public class ATTENDANCEMREPORTMX extends EntityMP implements Serializable {
         this.pimpersonid = pimpersonid ;
         this.modify("pimpersonid",pimpersonid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCERECORD.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤记录]
  */
@@ -367,10 +370,7 @@ public class ATTENDANCERECORD extends EntityMP implements Serializable {
         this.trmtrainplantermid = trmtrainplantermid ;
         this.modify("trmtrainplantermid",trmtrainplantermid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCERECORDTEMP.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤记录(中间表)]
  */
@@ -437,10 +440,7 @@ public class ATTENDANCERECORDTEMP extends EntityMP implements Serializable {
         this.ormorgsectorid = ormorgsectorid ;
         this.modify("ormorgsectorid",ormorgsectorid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCESETTINGS.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤人员]
  */
@@ -233,10 +236,7 @@ public class ATTENDANCESETTINGS extends EntityMP implements Serializable {
         this.pimpersonid = pimpersonid ;
         this.modify("pimpersonid",pimpersonid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDANCESUMMARYMX.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤汇总明细（停用）]
  */
@@ -143,10 +146,7 @@ public class ATTENDANCESUMMARYMX extends EntityMP implements Serializable {
         this.kqlx = kqlx ;
         this.modify("kqlx",kqlx);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDENCECALENDAR.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤日历]
  */
@@ -215,10 +218,7 @@ public class ATTENDENCECALENDAR extends EntityMP implements Serializable {
         this.vacholidayid = vacholidayid ;
         this.modify("vacholidayid",vacholidayid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDENCEORMORGSECTOR.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤部门]
  */
@@ -184,10 +187,7 @@ public class ATTENDENCEORMORGSECTOR extends EntityMP implements Serializable {
         this.attendencesetupid = attendencesetupid ;
         this.modify("attendencesetupid",attendencesetupid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDENCESETUP.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤设置]
  */
@@ -259,10 +262,7 @@ public class ATTENDENCESETUP extends EntityMP implements Serializable {
         this.vacholidayrulesid = vacholidayrulesid ;
         this.modify("vacholidayrulesid",vacholidayrulesid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENDENCETYPE.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤类型]
  */
@@ -114,10 +117,7 @@ public class ATTENDENCETYPE extends EntityMP implements Serializable {
         this.attendencetypename = attendencetypename ;
         this.modify("attendencetypename",attendencetypename);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENMEMBWES.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤员(停用)]
  */
@@ -105,10 +108,7 @@ public class ATTENMEMBWES extends EntityMP implements Serializable {
         this.attenmembwesname = attenmembwesname ;
         this.modify("attenmembwesname",attenmembwesname);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/ATTENSUMMARY.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤汇总]
  */
@@ -768,10 +771,7 @@ public class ATTENSUMMARY extends EntityMP implements Serializable {
         this.pimpersonid = pimpersonid ;
         this.modify("pimpersonid",pimpersonid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/att/domain/AttendRecordDetail.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[考勤记录明细]
  */
@@ -177,10 +180,7 @@ public class AttendRecordDetail extends EntityMP implements Serializable {
         this.attendancerecordid = attendancerecordid ;
         this.modify("attendancerecordid",attendancerecordid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/CodeItem.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[代码项]
  */
@@ -205,10 +208,7 @@ public class CodeItem extends EntityMP implements Serializable {
         this.codelistid = codelistid ;
         this.modify("codelistid",codelistid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/CodeList1.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[代码表]
  */
@@ -403,10 +406,7 @@ public class CodeList1 extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DALog.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[DA日志]
  */
@@ -177,10 +180,7 @@ public class DALog extends EntityMP implements Serializable {
         this.logtype = logtype ;
         this.modify("logtype",logtype);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DEDataChg.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[实体数据变更]
  */
@@ -183,10 +186,7 @@ public class DEDataChg extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DEDataChg2.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[实体数据变更（已处理）]
  */
@@ -211,10 +214,7 @@ public class DEDataChg2 extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DEDataChgDisp.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[实体数据变更派发引擎]
  */
@@ -204,10 +207,7 @@ public class DEDataChgDisp extends EntityMP implements Serializable {
         this.validflag = validflag ;
         this.modify("validflag",validflag);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataAudit.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据审计]
  */
@@ -203,10 +206,7 @@ public class DataAudit extends EntityMP implements Serializable {
         this.sessionid = sessionid ;
         this.modify("sessionid",sessionid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataAuditDetail.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据审计明细]
  */
@@ -183,10 +186,7 @@ public class DataAuditDetail extends EntityMP implements Serializable {
         this.dataauditid = dataauditid ;
         this.modify("dataauditid",dataauditid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataSyncAgent.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据同步代理]
  */
@@ -226,10 +229,7 @@ public class DataSyncAgent extends EntityMP implements Serializable {
         this.clientid = clientid ;
         this.modify("clientid",clientid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataSyncIn.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据同步接收队列]
  */
@@ -211,10 +214,7 @@ public class DataSyncIn extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataSyncIn2.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据同步接收队列2]
  */
@@ -225,10 +228,7 @@ public class DataSyncIn2 extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataSyncOut.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据同步发送队列]
  */
@@ -211,10 +214,7 @@ public class DataSyncOut extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/DataSyncOut2.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[数据同步发送队列2]
  */
@@ -225,10 +228,7 @@ public class DataSyncOut2 extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/File.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[文件]
  */
@@ -311,10 +314,7 @@ public class File extends EntityMP implements Serializable {
         this.picwidth = picwidth ;
         this.modify("picwidth",picwidth);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/LoginAccount.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[登录帐户]
  */
@@ -290,10 +293,7 @@ public class LoginAccount extends EntityMP implements Serializable {
         this.userid = userid ;
         this.modify("userid",userid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/LoginLog.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[帐户使用记录]
  */
@@ -199,10 +202,7 @@ public class LoginLog extends EntityMP implements Serializable {
         this.loginaccountid = loginaccountid ;
         this.modify("loginaccountid",loginaccountid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/MsgAccount.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[消息账户]
  */
@@ -268,10 +271,7 @@ public class MsgAccount extends EntityMP implements Serializable {
         this.mailaddress = mailaddress ;
         this.modify("mailaddress",mailaddress);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/MsgAccountDetail.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组消息账户明细]
  */
@@ -149,10 +152,7 @@ public class MsgAccountDetail extends EntityMP implements Serializable {
         this.minormsgaccountid = minormsgaccountid ;
         this.modify("minormsgaccountid",minormsgaccountid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/MsgSendQueue.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[消息发送队列]
  */
@@ -402,10 +405,7 @@ public class MsgSendQueue extends EntityMP implements Serializable {
         this.userdata = userdata ;
         this.modify("userdata",userdata);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/MsgSendQueueHis.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[消息发送队列（历史）]
  */
@@ -403,10 +406,7 @@ public class MsgSendQueueHis extends EntityMP implements Serializable {
         this.fileat3 = fileat3 ;
         this.modify("fileat3",fileat3);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/MsgTemplate.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[消息模板]
  */
@@ -311,10 +314,7 @@ public class MsgTemplate extends EntityMP implements Serializable {
         this.deid = deid ;
         this.modify("deid",deid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/Org.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织机构]
  */
@@ -652,10 +655,7 @@ public class Org extends EntityMP implements Serializable {
         this.porgid = porgid ;
         this.modify("porgid",porgid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgSecUser.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织部门人员]
  */
@@ -707,10 +710,21 @@ public class OrgSecUser extends EntityMP implements Serializable {
         this.orguserid = orguserid ;
         this.modify("orguserid",orguserid);
     }
-}
-
-
 
+    /**
+     * 获取 [组织部门人员标识]
+     */
+    public String getOrgsecuserid(){
+        if(ObjectUtils.isEmpty(orgsecuserid)){
+            orgsecuserid=(String)getDefaultKey(true);
+        }
+        return orgsecuserid;
+    }
 
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+        return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getOrgsectorid(),this.getOrguserid()).getBytes());
+    }
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgSecUserType.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[部门人员关系类型]
  */
@@ -571,10 +574,7 @@ public class OrgSecUserType extends EntityMP implements Serializable {
         this.reserver23 = reserver23 ;
         this.modify("reserver23",reserver23);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgSector.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织部门]
  */
@@ -745,10 +748,7 @@ public class OrgSector extends EntityMP implements Serializable {
         this.porgsectorid = porgsectorid ;
         this.modify("porgsectorid",porgsectorid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgType.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织类型]
  */
@@ -529,10 +532,7 @@ public class OrgType extends EntityMP implements Serializable {
         this.reserver25 = reserver25 ;
         this.modify("reserver25",reserver25);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgUnitCat.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织单元类别]
  */
@@ -557,10 +560,7 @@ public class OrgUnitCat extends EntityMP implements Serializable {
         this.reserver11 = reserver11 ;
         this.modify("reserver11",reserver11);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgUser.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织人员]
  */
@@ -740,10 +743,7 @@ public class OrgUser extends EntityMP implements Serializable {
         this.orgsecusertypeid = orgsecusertypeid ;
         this.modify("orgsecusertypeid",orgsecusertypeid);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/OrgUserLevel.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[组织人员级别]
  */
@@ -571,10 +574,7 @@ public class OrgUserLevel extends EntityMP implements Serializable {
         this.reserver8 = reserver8 ;
         this.modify("reserver8",reserver8);
     }
-}
-
-
-
 
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/PPModel.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[门户页面模型]
  */
@@ -800,10 +803,21 @@ public class PPModel extends EntityMP implements Serializable {
         this.c2pvpartid = c2pvpartid ;
         this.modify("c2pvpartid",c2pvpartid);
     }
-}
-
-
 
+    /**
+     * 获取 [用户频道页标识]
+     */
+    public String getPpmodelid(){
+        if(ObjectUtils.isEmpty(ppmodelid)){
+            ppmodelid=(String)getDefaultKey(true);
+        }
+        return ppmodelid;
+    }
 
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+        return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getPortalpageid(),this.getOwnerid()).getBytes());
+    }
+}
 
 

ehr-core/src/main/java/cn/ibizlab/ehr/core/common/domain/PVPart.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.ehr.util.domain.EntityBase;
 import cn.ibizlab.ehr.util.annotation.DEField;
 import cn.ibizlab.ehr.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.ehr.util.domain.EntityMP;
 
+
 /**
  * 实体[门户视图部件]
  */
@@ -162,10 +165,21 @@ public class PVPart extends EntityMP implements Serializable {
         this.portalpageid = portalpageid ;
         this.modify("portalpageid",portalpageid);
     }
-}
-
-
 
+    /**
+     * 获取 [门户视图部件标识]
+     */
+    public String getPvpartid(){
+        if(ObjectUtils.isEmpty(pvpartid)){
+            pvpartid=(String)getDefaultKey(true);
+        }
+        return pvpartid;
+    }
 
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+        return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getPortalpageid(),this.getCtrlid()).getBytes());
+    }
+}