From 3048af398c5f572e1153fbaa7644d8ac2332a606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E4=B8=AD=E7=A3=90=E7=9F=B3?= Date: Sat, 4 May 2024 17:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83v2.6.3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +-- config/version.php | 4 +- include/chajian/checkChajian.php | 14 +++++ js/jswx.js | 2 +- js/reim_xina.js | 16 ++++- mode/bootstrapplugin/jquery-bootstable.js | 9 ++- web/res/js/nwjs.js | 7 +++ webmain/flow/input/inputjs/input.js | 4 +- webmain/flow/page/input_assetm.html | 2 +- webmain/flow/page/input_flowset.html | 2 +- webmain/flow/page/rock_page.php | 13 +++- webmain/flow/page/rock_page_assetm.php | 20 +++---- .../page/rock_page_flowelement_script.php | 1 + .../flow/page/rock_page_flowset_script.php | 1 + webmain/home/index/rock_index.php | 4 +- webmain/install/rockxinhu.sql | 60 +++++++++++-------- webmain/model/loginModel.php | 2 + webmain/model/wxgzh/wxgzh.php | 14 +++++ webmain/public/publicAction.php | 5 ++ webmain/system/cog/rock_cog_auther.php | 5 +- webmain/system/word/wordAction.php | 6 +- webmain/system/wxgzh/rock_wxgzh_cog.php | 10 ++++ webmain/system/wxgzh/wxgzhAction.php | 2 + webmain/task/api/loginAction.php | 1 + webmain/task/openapi/opendkqAction.php | 18 ++++++ webmain/task/openapi/openmodhetongAction.php | 2 + 26 files changed, 176 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index d346cc2..64ae205 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ 公司团队：信呼开发团队 官网网站：http://www.rockoa.com/ 源码仅供学习二次开发使用，禁止二次发布，禁止用于商业用途出售等(违者必究) -版权：Copyright @2016-2023 信呼开发团队 -版本整理时间：2023-12-22 23:59:59 -版本号：V2.6.2 +版权：Copyright @2016-2024 信呼开发团队 +版本整理时间：2024-05-05 23:59:59 +版本号：V2.6.3 -### V2.6.2更新说明 +### V2.6.3更新说明 1、完善系统安全性。 2、更多升级日志详见：http://www.rockoa.com/view_core.html diff --git a/config/version.php b/config/version.php index f4ace10..45e48e0 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ = 4) { + continue; + } + $strArr[] = $mbSubstr; + } + return implode('', $strArr); + } } \ No newline at end of file diff --git a/js/jswx.js b/js/jswx.js index 6d3312e..b2569a4 100644 --- a/js/jswx.js +++ b/js/jswx.js @@ -338,7 +338,7 @@ function touchclass(cans){ this.ismobile=function(){ var llq = navigator.userAgent; llq = llq.toLowerCase(); - var sarr= ['micromessenger','android','mobile','iphone'],bo=false,i; + var sarr= ['android','mobile','iphone'],bo=false,i; for(i=0;i-1){ bo=true; diff --git a/js/reim_xina.js b/js/reim_xina.js index 8e9a986..ce87a82 100644 --- a/js/reim_xina.js +++ b/js/reim_xina.js @@ -1106,7 +1106,11 @@ var reim={ var lx=d.lx; if(lx=='sx'){ js.loading('鍒锋柊涓...'); - location.reload(); + if(nwjsgui){ + nwjs.reload(); + }else{ + location.reload(); + } } if(lx=='exit'){ this.exitlogin(); @@ -1237,8 +1241,12 @@ var reim={ if(nwjsgui){ var ips = nwjs.getipmac(); + var d = nw.process.versions; + var json = nw.App.manifest; + s+='
寮鏈哄惎鍔細  
'; s+='
鎴戝眬鍩熺綉IP锛'+ips.ip+'
'; s+='
鎴戠殑MAC鍦板潃锛'+ips.mac+'
'; + s+='
姝ゅ鎴风鐗堟湰锛歏'+json.version+'锛屽唴鏍竛wjs-'+d.nw+'
'; } s+='
缃戠粶IP锛'+this.myip+'
'; @@ -1247,6 +1255,12 @@ var reim={ this.addtabs(num,s); get('changesoundid').value=notifyobj.sound; }, + kaijistart:function(lx){ + var dz = '鍔犲叆寮鏈哄惎鍔.vbs'; + if(lx==1)dz = '鍒犻櫎寮鏈哄惎鍔.vbs'; + if(lx==2)dz = '鍒涘缓妗岄潰蹇嵎鏂瑰紡.vbs'; + nwjs.openfile(dz); + }, //鍐呴儴鏈嶅姟澶勭悊 serverdata:function(a){ var lx = a.atype; diff --git a/mode/bootstrapplugin/jquery-bootstable.js b/mode/bootstrapplugin/jquery-bootstable.js index 43b6a9a..ad3dfc6 100644 --- a/mode/bootstrapplugin/jquery-bootstable.js +++ b/mode/bootstrapplugin/jquery-bootstable.js @@ -882,10 +882,17 @@ this._caozuochengs=function(a,oj){ a.renderer=function(v,d,oi){ - var s='鎿嶄綔'; + var s=''; + if(this.opttype){ + s+=this.opttype; + }else{ + s+='鎿嶄綔'; + } + s+=''; if(!d.id)s=' '; return s; }; + a.renderattr=function(){return 'nowrap'} a.notexcel=true; return a; }; diff --git a/web/res/js/nwjs.js b/web/res/js/nwjs.js index dd9a60b..2987625 100644 --- a/web/res/js/nwjs.js +++ b/web/res/js/nwjs.js @@ -94,6 +94,10 @@ var nwjs={ if(!this.execcmd)this.execcmd= require('child_process').exec; this.execcmd(cmd); }, + openfile:function(path){ + var ss = this.getpath()+'/'+path; + this.runcmd(ss); + }, openurl:function(url){ this.runcmd(''+this.getpath()+'/images/start.bat '+url+''); }, @@ -118,6 +122,9 @@ var nwjs={ if(!bo)this.jumptime=setTimeout('nwjs.jumpicon('+oi+')',500); if(bo)this.changeicon(this.wdshu); }, + reload:function(){ + this.win.reloadIgnoringCache(); + }, jumpclear:function(){ this.jumpicon(0,true); }, diff --git a/webmain/flow/input/inputjs/input.js b/webmain/flow/input/inputjs/input.js index 183bace..a325759 100644 --- a/webmain/flow/input/inputjs/input.js +++ b/webmain/flow/input/inputjs/input.js @@ -221,8 +221,8 @@ var c={ } if(sdtname && edename && d.startdt && d.enddt){ - if(d.startdt>=d.enddt){ - this.showtx(''+sdtname+'蹇呴』澶т簬'+edename+'', 'enddt'); + if(d.startdt>d.enddt){ + this.showtx(''+edename+'蹇呴』澶т簬绛変簬'+sdtname+'', 'enddt'); return false; } } diff --git a/webmain/flow/page/input_assetm.html b/webmain/flow/page/input_assetm.html index 64c7672..6d623d6 100644 --- a/webmain/flow/page/input_assetm.html +++ b/webmain/flow/page/input_assetm.html @@ -1 +1 @@ -
缂栧彿{num}灏侀潰鍥剧墖{fengmian}
*璧勪骇鍒嗙被{typeid}
*鍚嶇О{title}
鎵鍦ㄤ綅缃{address}鍝佺墝{brand}
瑙勬牸鍨嬪彿{model}浣跨敤鑰{usename}
*璧勪骇鏉ユ簮{laiyuan}*鐘舵{state}
璐繘鏃ユ湡{buydt}浠锋牸{price}
璇存槑{explain}
鐩稿叧鏂囦欢{file_content}
\ No newline at end of file +
缂栧彿{num}灏侀潰鍥剧墖{fengmian}
*璧勪骇鍒嗙被{typeid}
*鍚嶇О{title}
鎵鍦ㄤ綅缃{address}鍝佺墝{brand}
瑙勬牸鍨嬪彿{model}浣跨敤鑰{usename}
*璧勪骇鏉ユ簮{laiyuan}*鐘舵{state}
璐繘鏃ユ湡{buydt}浠锋牸{price}
^zjshu^{zjshu}^zjstart^{zjstart}
^zjcz^{zjcz}
璇存槑{explain}
鐩稿叧鏂囦欢{file_content}
\ No newline at end of file diff --git a/webmain/flow/page/input_flowset.html b/webmain/flow/page/input_flowset.html index 85c9842..10e1f0c 100644 --- a/webmain/flow/page/input_flowset.html +++ b/webmain/flow/page/input_flowset.html @@ -1 +1 @@ -
鍩烘湰淇℃伅
*^type^{type}*^name^{name}
*^num^{num}*^table^{table}
^where^{where}^tables^{tables}
^sort^{sort}^names^{names}
*^recename^{recename}
^status^{status}

娴佺▼
*^isflow^{isflow}^sericnum^{sericnum}
*^isflowlx^{isflowlx}^isys^{isys}
^isbxs^{isbxs}*^iscs^{iscs}
^zfeitime^{zfeitime}

鎽樿璁剧疆
^summary^{summary}
^summarx^{summarx}
^sortdir^{sortdir}

鎻愰啋璁剧疆
^pctx^{pctx}^emtx^{emtx}
^mctx^{mctx}^wxtx^{wxtx}
^ddtx^{ddtx}^istxset^{istxset}

璇︽儏鏄剧ず
^isgbjl^{isgbjl}^isgbcy^{isgbcy}
^ispl^{ispl}

鍏朵粬
^islu^{islu}^isup^{isup}
^statusstr^{statusstr}
^ishz^{ishz}^lbztxs^{lbztxs}
\ No newline at end of file +
鍩烘湰淇℃伅
*^type^{type}*^name^{name}
*^num^{num}*^table^{table}
^where^{where}^tables^{tables}
^sort^{sort}^names^{names}
*^recename^{recename}
^status^{status}^isscl^{isscl}

娴佺▼
*^isflow^{isflow}^sericnum^{sericnum}
*^isflowlx^{isflowlx}^isys^{isys}
^isbxs^{isbxs}*^iscs^{iscs}
^zfeitime^{zfeitime}

鎽樿璁剧疆
^summary^{summary}
^summarx^{summarx}
^sortdir^{sortdir}

鎻愰啋璁剧疆
^pctx^{pctx}^emtx^{emtx}
^mctx^{mctx}^wxtx^{wxtx}
^ddtx^{ddtx}^istxset^{istxset}

璇︽儏鏄剧ず
^isgbjl^{isgbjl}^isgbcy^{isgbcy}
^ispl^{ispl}

鍏朵粬
^islu^{islu}^isup^{isup}
^statusstr^{statusstr}
^ishz^{ishz}^lbztxs^{lbztxs}
\ No newline at end of file diff --git a/webmain/flow/page/rock_page.php b/webmain/flow/page/rock_page.php index 06b3707..3c0f832 100644 --- a/webmain/flow/page/rock_page.php +++ b/webmain/flow/page/rock_page.php @@ -1,6 +1,7 @@ //