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

ibizdev提交

上级 f6ccaed2
.login{ .login{
width: 100vh; width: 100vh;
height: 100vh; height: 100vh;
> img{ // background-image: url('../assets/images/login_bg.jpg');
width: 100vw; background-size: cover;
height: 100vh; background-position: center;
} position: relative;
.login-logo{
position: fixed;
left: 80px;
top: 80px;
}
.login-content{
position: fixed;
left: 10%;
top: 30%;
width: 60%;
>span{
color: #fff;
font-size: 84px;
}
}
&-con{ &-con{
position: fixed; position: fixed;
right: 160px; right: 160px;
top: 50%; top: 50%;
transform: translateY(-60%); transform: translateY(-60%);
width: 300px; width: 300px;
.ivu-card-head {
padding: 14px 6px;
>p{
line-height: 20px;
font-size: 14px;
color: #17233d;
font-weight: 700;
}
}
&-header{ &-header{
font-size: 16px; font-size: 16px;
font-weight: 300; font-weight: 300;
......
<template> <template>
<div class='login'> <div class='login'>
<img src="/assets/img/login_bg.png"/>
<div class="login-logo">
<img src ="/assets/img/logo.svg"/>
</div>
<div class="login-content">
<span>{{appTitle}}</span>
</div>
<div class='login-con'> <div class='login-con'>
<card :bordered="false"> <card :bordered="false">
<p slot='title'> <p slot='title'>
...@@ -62,15 +55,7 @@ export default class Login extends Vue { ...@@ -62,15 +55,7 @@ export default class Login extends Vue {
* @type {*} * @type {*}
* @memberof Login * @memberof Login
*/ */
public form: any = { loginname: 'guest', password: 'guest' }; public form: any = { loginname: null, password: null };
/**
* 应用标题
*
* @type {string}
* @memberof Login
*/
public appTitle:string = Environment.AppTitle;
/** /**
* 值规则 * 值规则
...@@ -133,12 +118,8 @@ export default class Login extends Vue { ...@@ -133,12 +118,8 @@ export default class Login extends Vue {
post.then((response: any) => { post.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
if(data && data.token){ localStorage.setItem('token', data.token);
localStorage.setItem('token', data.token); localStorage.setItem('user', JSON.stringify(data.user));
}
if(data && data.user){
localStorage.setItem('user', JSON.stringify(data.user));
}
const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*'; const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
this.$router.push({ path: url }); this.$router.push({ path: url });
} }
......
...@@ -154,8 +154,7 @@ body { ...@@ -154,8 +154,7 @@ body {
.dashboard{ .dashboard{
padding: 8px; padding: 8px;
} }
.portlet-card, .portlet-container{ .portlet-container{
// .portlet-container{
background: #efefef; background: #efefef;
} }
.portlet-container::after{ .portlet-container::after{
......
...@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance(); ...@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
// 模拟数据 // 模拟数据
const mockDatas: Array<any> = [ 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-13 22:28:50","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-13 22:28:50","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-13 23:36:49","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-13 23:36:49","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-13 22:28:50","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-13 22:28:50","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-13 23:36:49","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-13 23:36:49","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-13 22:28:50","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-13 22:28:50","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-13 23:36:49","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-13 23:36:49","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-13 22:28:50","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-13 22:28:50","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-13 23:36:49","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-13 23:36:49","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-13 22:28:50","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-13 22:28:50","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-13 23:36:49","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-13 23:36:49","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-13 22:28:50","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-13 22:28:50","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-13 23:36:49","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-13 23:36:49","createman":"示例操作者","pimpersonname":null}
]; ];
......
import { UserDefaultComponent } from './user-default-register'; import { UserDefaultComponent } from './user-default-register';
import AppOrgPNum from './components/app-org-p-num/app-org-p-num.vue'
import AppOrgVocNumList from './components/app-org-voc-num-list/app-org-voc-num-list.vue'
export const UserComponent = { export const UserComponent = {
install(v: any, opt: any) { install(v: any, opt: any) {
UserDefaultComponent.install(v, opt); UserDefaultComponent.install(v, opt);
v.component('app-org-p-num', AppOrgPNum);
v.component('app-org-voc-num-list', AppOrgVocNumList);
} }
}; };
\ No newline at end of file
...@@ -6,72 +6,72 @@ ...@@ -6,72 +6,72 @@
<row v-if="!isHasCustomized"> <row v-if="!isHasCustomized">
<div style = ''> <div style = ''>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet1 <view_db_sysportlet1
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
name="db_sysportlet1" name="db_sysportlet1"
ref='db_sysportlet1' ref='db_sysportlet1'
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_db_sysportlet1> </view_db_sysportlet1>
</span> </span>
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 16, offset: 0}" :sm="{ span: 16, offset: 0}" :md="{ span: 16, offset: 0 }" :lg="{ span: 16, offset: 0 }"> <i-col :xs="{ span: 16, offset: 0}" :sm="{ span: 16, offset: 0}" :md="{ span: 16, offset: 0 }" :lg="{ span: 16, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet2 <view_db_sysportlet2
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
name="db_sysportlet2" name="db_sysportlet2"
ref='db_sysportlet2' ref='db_sysportlet2'
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_db_sysportlet2> </view_db_sysportlet2>
</span> </span>
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet4 <view_db_sysportlet4
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
name="db_sysportlet4" name="db_sysportlet4"
ref='db_sysportlet4' ref='db_sysportlet4'
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_db_sysportlet4> </view_db_sysportlet4>
</span> </span>
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet3 <view_db_sysportlet3
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
name="db_sysportlet3" name="db_sysportlet3"
ref='db_sysportlet3' ref='db_sysportlet3'
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_db_sysportlet3> </view_db_sysportlet3>
</span> </span>
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet5 <view_db_sysportlet5
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
name="db_sysportlet5" name="db_sysportlet5"
ref='db_sysportlet5' ref='db_sysportlet5'
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_db_sysportlet5> </view_db_sysportlet5>
</span> </span>
</card> </card>
</i-col> </i-col>
......
...@@ -3,10 +3,6 @@ ...@@ -3,10 +3,6 @@
.app-list { .app-list {
flex-grow: 1; flex-grow: 1;
overflow-y: auto; overflow-y: auto;
height: 100%;
>div{
height: 100%;
}
.app-list-item { .app-list-item {
line-height: 34px; line-height: 34px;
} }
......
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
git clone -b master $para2 ehr/ git clone -b master $para2 ehr/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ehr/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar 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 ADD ehr-app-ehr.jar /ehr-app-ehr.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehr: ehr-app-ehr:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar 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 ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrapp: ehr-app-ehrapp:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar 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 ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrhelp: ehr-app-ehrhelp:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar 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 ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrmob: ehr-app-ehrmob:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar 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 ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrorm: ehr-app-ehrorm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar 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 ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrpcm: ehr-app-ehrpcm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar 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 ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrpcm2: ehr-app-ehrpcm2:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar 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 ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrpim: ehr-app-ehrpim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar 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 ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrweb: ehr-app-ehrweb:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar 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 ADD ehr-app-web.jar /ehr-app-web.jar
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-web: ehr-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
因为 它太大了无法显示 源差异 。您可以改为 查看blob
...@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner { ...@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.enablePermissionValid:false}") @Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验 boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}") @Value("${ibiz.systemid:1A92486F-D8D6-42F7-BD14-426751088CC5}")
private String systemId; private String systemId;
@Override @Override
......
...@@ -3,7 +3,7 @@ spring: ...@@ -3,7 +3,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 172.16.102.211:8848 server-addr: 172.16.240.110:8848
cache: cache:
redis: redis:
time-to-live: 3600 time-to-live: 3600
...@@ -20,6 +20,32 @@ spring: ...@@ -20,6 +20,32 @@ spring:
max-wait: 300ms max-wait: 300ms
max-idle: 16 max-idle: 16
min-idle: 8 min-idle: 8
datasource:
username: BPMEHR
password: 'sys'
url: jdbc:oracle:thin:@172.16.170.71:1521:localorcl
driver-class-name: oracle.jdbc.driver.OracleDriver
filters: stat,wall,log4j2
#配置初始化大小/最小/最大
initial-size: 1
min-idle: 1
max-active: 20
#获取连接等待超时时间
max-wait: 60000
#间隔多久进行一次检测,检测需要关闭的空闲连接
time-between-eviction-runs-millis: 60000
#一个连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
#打开PSCache,并指定每个连接上PSCache的大小。oracle设为true,mysql设为false。分库分表较多推荐设置为false
pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20
isSyncDBSchema: false
defaultSchema: BPMEHR
conf: classpath:liquibase/master.xml
#Mybatis-plus配置 #Mybatis-plus配置
mybatis-plus: mybatis-plus:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册