diff --git a/app_WFWeb/src/locale/lanres/wfim/wfim_en_US.ts b/app_WFWeb/src/locale/lanres/wfim/wfim_en_US.ts
index 0b4b66bf4ab6253215a22a215517e5e429d2fd78..959b36144de2ad558d42046389207841977ae98d 100644
--- a/app_WFWeb/src/locale/lanres/wfim/wfim_en_US.ts
+++ b/app_WFWeb/src/locale/lanres/wfim/wfim_en_US.ts
@@ -118,14 +118,14 @@ export default {
caption: "鍥為€€",
tip: "deuiaction1_sendback",
},
- tbitem24_c66: {
- caption: "閫佷細绛�",
- tip: "tbitem24_c66",
- },
tbitem24_c47: {
caption: "閫侀甯闄╁畼瀹℃牳",
tip: "tbitem24_c47",
},
+ tbitem24_c66: {
+ caption: "閫佷細绛�",
+ tip: "tbitem24_c66",
+ },
tbitem24_c37: {
caption: "閫佽法鍏徃浼氱",
tip: "tbitem24_c37",
diff --git a/app_WFWeb/src/locale/lanres/wfim/wfim_zh_CN.ts b/app_WFWeb/src/locale/lanres/wfim/wfim_zh_CN.ts
index b07c5751c82094ec3730deb44be5409331de6004..3d2af4bd9ed7a5728cc6be176a379aaf83a30973 100644
--- a/app_WFWeb/src/locale/lanres/wfim/wfim_zh_CN.ts
+++ b/app_WFWeb/src/locale/lanres/wfim/wfim_zh_CN.ts
@@ -117,14 +117,14 @@ export default {
caption: '鍥為€€',
tip: '鍥為€€',
},
- tbitem24_c66: {
- caption: '閫佷細绛�',
- tip: '閫佷細绛�',
- },
tbitem24_c47: {
caption: '閫侀甯闄╁畼瀹℃牳',
tip: '閫侀甯闄╁畼瀹℃牳',
},
+ tbitem24_c66: {
+ caption: '閫佷細绛�',
+ tip: '閫佷細绛�',
+ },
tbitem24_c37: {
caption: '閫佽法鍏徃浼氱',
tip: '閫佽法鍏徃浼氱',
diff --git a/app_WFWeb/src/pages/htwf/wfimwfim-w30-wfedit-view3/wfimwfim-w30-wfedit-view3-base.vue b/app_WFWeb/src/pages/htwf/wfimwfim-w30-wfedit-view3/wfimwfim-w30-wfedit-view3-base.vue
index 8859d9c76863cd0c5e2691a8730fef718a480cdd..2f5d895a1a25171c2d35698f2326e977148a9cc7 100644
--- a/app_WFWeb/src/pages/htwf/wfimwfim-w30-wfedit-view3/wfimwfim-w30-wfedit-view3-base.vue
+++ b/app_WFWeb/src/pages/htwf/wfimwfim-w30-wfedit-view3/wfimwfim-w30-wfedit-view3-base.vue
@@ -19,18 +19,18 @@
<div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.deuiaction1_sendback.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
- <i-button v-show="toolBarModels.tbitem24_c66.visabled" :disabled="toolBarModels.tbitem24_c66.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c66' }, $event)">
+ <i-button v-show="toolBarModels.tbitem24_c47.visabled" :disabled="toolBarModels.tbitem24_c47.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c47' }, $event)">
<i class=''></i>
- <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.caption')}}</span>
+ <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.caption')}}</span>
</i-button>
- <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.tip')}}</div>
+ <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
- <i-button v-show="toolBarModels.tbitem24_c47.visabled" :disabled="toolBarModels.tbitem24_c47.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c47' }, $event)">
+ <i-button v-show="toolBarModels.tbitem24_c66.visabled" :disabled="toolBarModels.tbitem24_c66.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c66' }, $event)">
<i class=''></i>
- <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.caption')}}</span>
+ <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.caption')}}</span>
</i-button>
- <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.tip')}}</div>
+ <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem24_c37.visabled" :disabled="toolBarModels.tbitem24_c37.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c37' }, $event)">
@@ -275,10 +275,10 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
public toolBarModels: any = {
deuiaction1_sendback: { name: 'deuiaction1_sendback', caption: '鍥為€€', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Sendback', target: 'SINGLEKEY' } },
- tbitem24_c66: { name: 'tbitem24_c66', caption: '閫佷細绛�', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C66', target: 'MULTIKEY' } },
-
tbitem24_c47: { name: 'tbitem24_c47', caption: '閫侀甯闄╁畼瀹℃牳', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C47', target: 'MULTIKEY' } },
+ tbitem24_c66: { name: 'tbitem24_c66', caption: '閫佷細绛�', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C66', target: 'MULTIKEY' } },
+
tbitem24_c37: { name: 'tbitem24_c37', caption: '閫佽法鍏徃浼氱', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C37', target: 'MULTIKEY' } },
tbitem24_c44: { name: 'tbitem24_c44', caption: '閫佸悎瑙勬€荤洃瀹℃壒', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C44', target: 'MULTIKEY' } },
@@ -451,12 +451,12 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
if (Object.is($event.tag, 'deuiaction1_sendback')) {
this.toolbar_deuiaction1_sendback_click($event, '', $event2);
}
- if (Object.is($event.tag, 'tbitem24_c66')) {
- this.toolbar_tbitem24_c66_click($event, '', $event2);
- }
if (Object.is($event.tag, 'tbitem24_c47')) {
this.toolbar_tbitem24_c47_click($event, '', $event2);
}
+ if (Object.is($event.tag, 'tbitem24_c66')) {
+ this.toolbar_tbitem24_c66_click($event, '', $event2);
+ }
if (Object.is($event.tag, 'tbitem24_c37')) {
this.toolbar_tbitem24_c37_click($event, '', $event2);
}
@@ -573,7 +573,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
* @param {*} [$event]
* @memberof
*/
- protected toolbar_tbitem24_c66_click(params: any = {}, tag?: any, $event?: any) {
+ protected toolbar_tbitem24_c47_click(params: any = {}, tag?: any, $event?: any) {
// 鍙傛暟
// 鍙栨暟
let datas: any[] = [];
@@ -582,14 +582,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
const _this: any = this;
let paramJO:any = {};
- let contextJO:any = {"srfwfiatag":"C66","srfwfstep":"30"};
+ let contextJO:any = {"srfwfiatag":"C47","srfwfstep":"30"};
xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
// 鐣岄潰琛屼负
const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService();
- curUIService.IMWFv1_C66(datas,contextJO, paramJO, $event, xData,this,"WFIM");
+ curUIService.IMWFv1_C47(datas,contextJO, paramJO, $event, xData,this,"WFIM");
}
/**
@@ -600,7 +600,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
* @param {*} [$event]
* @memberof
*/
- protected toolbar_tbitem24_c47_click(params: any = {}, tag?: any, $event?: any) {
+ protected toolbar_tbitem24_c66_click(params: any = {}, tag?: any, $event?: any) {
// 鍙傛暟
// 鍙栨暟
let datas: any[] = [];
@@ -609,14 +609,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
const _this: any = this;
let paramJO:any = {};
- let contextJO:any = {"srfwfiatag":"C47","srfwfstep":"30"};
+ let contextJO:any = {"srfwfiatag":"C66","srfwfstep":"30"};
xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
// 鐣岄潰琛屼负
const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService();
- curUIService.IMWFv1_C47(datas,contextJO, paramJO, $event, xData,this,"WFIM");
+ curUIService.IMWFv1_C66(datas,contextJO, paramJO, $event, xData,this,"WFIM");
}
/**
diff --git a/config.xml b/config.xml
index 5257bf43354b0a84eb8fe542cf8e60eb98bf7c7a..ec2029da70f6c5f1949e34dff8f6096fbaab9fd9 100644
--- a/config.xml
+++ b/config.xml
@@ -40,14 +40,14 @@
mvn install
cd ..
mvn install
- cd im-app/im-app-web
+ cd im-app/im-app-wfweb
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/2C5840FD-07EF-4719-9D83-6E960583E30D"
- setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D
- setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D'| 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/2C5840FD-07EF-4719-9D83-6E960583E30D/im-app-web.jar >>/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D/im_appim 涓氬姟搴旂敤-`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/AAD5D106-FE84-4E18-985D-A43198FE466F"
+ setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im-app-wfweb.jar root@172.16.102.61:/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F
+ setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F'| 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/AAD5D106-FE84-4E18-985D-A43198FE466F/im-app-wfweb.jar >>/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im_appim 娴佺▼搴旂敤-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
</command>
</hudson.tasks.Shell>
</builders>
diff --git a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java
index adb57934e502a17dfc3be029fff0eae97bf1ed11..58441c93a4aadc4f76062975969bf14bcaa1022b 100644
--- a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java
+++ b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java
@@ -180,6 +180,9 @@ public class WFASService {
wfas = new WFAS();
wfas.setProxydataid(data.getString("proxydataid"));
wfas.setProxymoduleid(data.getString("proxymoduleid"));
+ if (data.getString("proxymodulename") != null) {
+ wfas.setWFASName(data.getString("proxymodulename"));
+ }
String pinstid = data.getString("pinstid");
if(pinstid != null && !pinstid.isEmpty()) {
diff --git a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java
index 291517c2195dde11001305bc781f98ba24c7cd23..16517df2eb184347eebfa7f427bb9317fd23099a 100644
--- a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java
+++ b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java
@@ -180,6 +180,9 @@ public class WFBCService {
wfbc = new WFBC();
wfbc.setProxydataid(data.getString("proxydataid"));
wfbc.setProxymoduleid(data.getString("proxymoduleid"));
+ if (data.getString("proxymodulename") != null) {
+ wfbc.setWFBCName(data.getString("proxymodulename"));
+ }
String pinstid = data.getString("pinstid");
if(pinstid != null && !pinstid.isEmpty()) {
diff --git a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java
index e572c2c8b53ffc1c81493dca64c2a65bd74fedd1..f5e6b8efc6e7cbdcd2527252cb560d3aec728048 100644
--- a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java
+++ b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java
@@ -180,6 +180,9 @@ public class WFBMService {
wfbm = new WFBM();
wfbm.setProxydataid(data.getString("proxydataid"));
wfbm.setProxymoduleid(data.getString("proxymoduleid"));
+ if (data.getString("proxymodulename") != null) {
+ wfbm.setWFBMName(data.getString("proxymodulename"));
+ }
String pinstid = data.getString("pinstid");
if(pinstid != null && !pinstid.isEmpty()) {
diff --git a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java
index 083a422699ba979e6e8d49a9761ee746df50b00f..8f3b2b9eae95053ae80f89fb42e4a489be608e29 100644
--- a/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java
+++ b/im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java
@@ -180,6 +180,9 @@ public class WFIMService {
wfim = new WFIM();
wfim.setProxydataid(data.getString("proxydataid"));
wfim.setProxymoduleid(data.getString("proxymoduleid"));
+ if (data.getString("proxymodulename") != null) {
+ wfim.setWFIMName(data.getString("proxymodulename"));
+ }
String pinstid = data.getString("pinstid");
if(pinstid != null && !pinstid.isEmpty()) {
diff --git a/im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml b/im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml
index afc8c454756e6872609b097612d7e89bb7816ac8..709496d43ece1e60103b7ad1011ff67855a1d763 100644
--- a/im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml
+++ b/im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml
@@ -1,6 +1,6 @@
server:
devmode: false
- port: 8202
+ port: 8203
servlet:
session:
cookie: