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

ibizdev提交

上级 124ed5cc
......@@ -152,6 +152,14 @@ export default {
caption: "-",
tip: "tbitem16",
},
tbitem17_createandstartim: {
caption: "导出结果",
tip: "tbitem17_createandstartim",
},
tbitem20: {
caption: "-",
tip: "tbitem20",
},
tbitem23: {
caption: "第一个记录",
tip: "tbitem23",
......
......@@ -151,6 +151,14 @@ export default {
caption: '-',
tip: '',
},
tbitem17_createandstartim: {
caption: '导出结果',
tip: '导出结果',
},
tbitem20: {
caption: '-',
tip: '',
},
tbitem23: {
caption: '第一个记录',
tip: '第一个记录',
......
......@@ -51,6 +51,13 @@
</i-button>
<div slot='content'>{{$t('ps.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem17_createandstartim.visabled" :disabled="toolBarModels.tbitem17_createandstartim.disabled" class='' @click="toolbar_click({ tag: 'tbitem17_createandstartim' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('ps.editviewtoolbar_toolbar.tbitem17_createandstartim.caption')}}</span>
</i-button>
<div slot='content'>{{$t('ps.editviewtoolbar_toolbar.tbitem17_createandstartim.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' @click="toolbar_click({ tag: 'tbitem23' }, $event)">
<i class='fa fa-fast-backward'></i>
......@@ -130,6 +137,7 @@ import PSService from '@/service/ps/ps-service';
import EditViewEngine from '@engine/view/edit-view-engine';
import PSUIService from '@/uiservice/ps/ps-ui-service';
@Component({
components: {
......@@ -301,6 +309,9 @@ export default class PSEditViewBase extends Vue {
tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem17_createandstartim: { name: 'tbitem17_createandstartim', caption: '导出结果', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'CreateAndStartIM', target: 'SINGLEKEY' } },
tbitem20: { name: 'tbitem20', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
tbitem24: { name: 'tbitem24', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
......@@ -485,6 +496,9 @@ export default class PSEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
}
if (Object.is($event.tag, 'tbitem17_createandstartim')) {
this.toolbar_tbitem17_createandstartim_click($event, '', $event2);
}
if (Object.is($event.tag, 'tbitem23')) {
this.toolbar_tbitem23_click($event, '', $event2);
}
......@@ -774,6 +788,33 @@ export default class PSEditViewBase extends Vue {
this.Print(datas, contextJO,paramJO, $event, xData,this,"PS");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
protected toolbar_tbitem17_createandstartim_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
// 界面行为
const curUIService:PSUIService = new PSUIService();
curUIService.PS_CreateAndStartIM(datas,contextJO, paramJO, $event, xData,this,"PS");
}
/**
* 逻辑事件
*
......
......@@ -40,14 +40,14 @@
mvn install
cd ..
mvn install
cd ps-boot
mvn clean package
cd ps-app/ps-app-web
mvn clean package -Pprod
echo &apos;echo &quot;$para1&quot;&apos; &gt; apppasswd.sh
chmod -R 777 *
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;mkdir -p /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; scp -r ./target/ps.jar root@172.16.102.61:/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;ps -ef | grep &apos;/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5&apos;| tr -s &apos; &apos;|cut -d&apos; &apos; -f2,8,9 | grep -v grep | grep &apos;jar&apos; | cut -d&apos; &apos; -f1|xargs --no-run-if-empty kill -9&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps.jar &gt;&gt;/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps_apips 服务-`date --date=&apos;0 days ago&apos; +%Y-%m-%d`.log 2&gt;&amp;1 &amp;&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;mkdir -p /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; scp -r ./target/ps-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;ps -ef | grep &apos;/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6&apos;| tr -s &apos; &apos;|cut -d&apos; &apos; -f2,8,9 | grep -v grep | grep &apos;jar&apos; | cut -d&apos; &apos; -f1|xargs --no-run-if-empty kill -9&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps-app-web.jar &gt;&gt;/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps_appps 应用-`date --date=&apos;0 days ago&apos; +%Y-%m-%d`.log 2&gt;&amp;1 &amp;&quot;
</command>
</hudson.tasks.Shell>
</builders>
......
server:
devmode: true
port: 8080
devmode: false
port: 8204
servlet:
session:
cookie:
......@@ -17,11 +17,11 @@ spring:
security:
cas:
server:
host: http://passportcs.ibizlab.cn
host: https://passport.ibizlab.cn
login: ${security.cas.server.host}/login
logout: ${security.cas.server.host}/logout
service:
host: http://localhost:${server.port}
host: http://172.16.102.61:${server.port}
login: /login/cas
logout: /logout
......@@ -36,7 +36,7 @@ logging:
app:
web:
url: http://localhost:${server.port}
url: http://172.16.102.61:${server.port}
wfstarturl: /#/%s/null/editview
# wfviewurl: /#/dewfdataredirectview
wfviewurl: /#/appwfdataredirectview
......
server:
port: 8201
port: 8080
spring:
application:
......@@ -8,29 +8,6 @@ spring:
nacos:
discovery:
server-addr: 172.16.102.211:8848
datasource:
password: 'D17c6@06'
username: a_LAB01_a0e25d193
url: jdbc:mysql://172.16.186.185:3306/a_LAB01_a0e25d193?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
driver-class-name: com.mysql.jdbc.Driver
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
feign:
sentinel:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册