Skip to content

PS
PS
提交 4b20591a 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 32057b60
隐藏空白字符变更
内嵌 并排
正在显示 包含 44 行增加 和 35 行删除
app_Web/src/locale/lanres/ps/ps_en_US.ts
浏览文件 @ 4b20591a
......@@ -22,6 +22,7 @@ export default {
srfsourcekey: "",
psname: "采购单名称",
bz: "备注",
createman: "建立人",
psid: "采购单标识",
},
uiactions: {
......
app_Web/src/locale/lanres/ps/ps_zh_CN.ts
浏览文件 @ 4b20591a
......@@ -21,6 +21,7 @@ export default {
srfsourcekey: '',
psname: '采购单名称',
bz: '备注',
createman: '建立人',
psid: '采购单标识',
},
uiactions: {
......
app_Web/src/widgets/ps/main-form/main-form-base.vue
浏览文件 @ 4b20591a
......@@ -328,6 +328,7 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey: null,
psname: null,
bz: null,
createman: null,
psid: null,
ps:null,
};
......@@ -423,6 +424,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '备注 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
],
createman: [
{ type: 'string', message: '建立人 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '建立人 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '建立人 值不能为空', trigger: 'blur' },
],
psid: [
{ type: 'string', message: '采购单标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '采购单标识 值必须为字符串类型', trigger: 'blur' },
......@@ -461,6 +468,8 @@ export default class MainBase extends Vue implements ControlInterface {
psname: new FormItemModel({ caption: '采购单名称', detailType: 'FORMITEM', name: 'psname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
bz: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'bz', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
psid: new FormItemModel({ caption: '采购单标识', detailType: 'FORMITEM', name: 'psid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
......@@ -586,6 +595,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'bz', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 createman 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.createman')
onCreatemanChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'createman', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 psid 值
*
......@@ -647,6 +668,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......@@ -1515,6 +1537,9 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public createDefault(){
if (this.data.hasOwnProperty('createman')) {
this.data['createman'] = this.context['srfuserid'];
}
}
......
app_Web/src/widgets/ps/main-form/main-form-model.ts
浏览文件 @ 4b20591a
......@@ -59,6 +59,11 @@ export default class MainModel {
prop: 'bz',
dataType: 'LONGTEXT_1000',
},
{
name: 'createman',
prop: 'createman',
dataType: 'TEXT',
},
{
name: 'psid',
prop: 'psid',
......
config.xml
浏览文件 @ 4b20591a
......@@ -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 'echo "$para1"' > apppasswd.sh
chmod -R 777 *
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps.jar root@172.16.102.61:/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5'| tr -s ' '|cut -d' ' -f2,8,9 | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs --no-run-if-empty kill -9"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "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 >>/ibiz/nodes/node1/F2F47711-2592-4F2B-9C54-F0722AEA90D5/ps_apips 服务-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/ps-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6'| tr -s ' '|cut -d' ' -f2,8,9 | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs --no-run-if-empty kill -9"
setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "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 >>/ibiz/nodes/node1/7B163728-8A01-45A9-862D-13C620F053F6/ps_appps 应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
</command>
</hudson.tasks.Shell>
</builders>
......
ps-app/ps-app-web/src/main/resources/application-web.yml
浏览文件 @ 4b20591a
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
......
ps-boot/src/main/resources/application-dev.yml
浏览文件 @ 4b20591a
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或