diff --git a/README.md b/README.md index 64ae205..527f053 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ 官网网站：http://www.rockoa.com/ 源码仅供学习二次开发使用，禁止二次发布，禁止用于商业用途出售等(违者必究) 版权：Copyright @2016-2024 信呼开发团队 -版本整理时间：2024-05-05 23:59:59 -版本号：V2.6.3 +版本整理时间：2024-07-31 23:59:59 +版本号：V2.6.4 -### V2.6.3更新说明 +### V2.6.4更新说明 1、完善系统安全性。 2、更多升级日志详见：http://www.rockoa.com/view_core.html @@ -36,7 +36,7 @@ ### 信呼声明 -1、没有一款系统是100%安全，信呼也是如此，任何暴露在公网中的系统，都有数据泄露的风险，一旦您决定将信呼OA部署在公网环境中，请仔细评估可能由此带来的风险，并尽可能的加强安全措施。 +1、没有一款系统是100%安全，信呼OA也是如此，任何暴露在公网中的系统，都有数据泄露的风险，一旦您决定将信呼OA部署在公网环境中，请仔细评估可能由此带来的风险，并尽可能的加强安全措施。 2、或许您觉得此系统不好有缺陷或漏洞等，欢迎提意见和您的想法给我们，或者发邮件给我们：admin@rockoa.com。 ### 声明感谢 diff --git a/config/version.php b/config/version.php index 45e48e0..fed5b88 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ mapqqkey.''; - $result = c('curl')->getcurl($url); - - echo $result; + $this->getkey(); + } + + public function getkey() + { + $key = getconfig('qqmapkey'); + if(!$key){ + $key = $this->rock->jm->base64decode('NTVRQlotSkdZTE8tQkFMV1gtU1pFNEgtNVNWNUstSkNGVjc:'); + }else{ + $this->mapqq_key = $key; + } + //$this->mapqq_key = $key; + return $key; + } + + private function mapqqerr($msg=''){ + if(!$msg)$msg = '鏃犳硶璁块棶鑵捐鍦板浘鎺ュ彛'; + return '{"status":201,"message":"'.$msg.'"}';; + } + + //鑾峰彇浣嶇疆 + public function gcoder($lat, $lng) + { + if(!$this->mapqq_key){ + $barr = c('xinhuapi')->getdata('mapqq','gcoder', array( + 'lat' => $lat, + 'lng' => $lng, + )); + if(!$barr['success'])return $this->mapqqerr($barr['msg']); + return $barr['data']; + }else{ + $url = 'https://apis.map.qq.com/ws/geocoder/v1?key='.$this->mapqq_key.''; + $url.= '&get_poi=0';//涓嶈繑鍥炲懆杈逛綅缃 + $url.= '&location='.$lat.','.$lng.''; + $url.= '&poi_options=radius=200'; + $result = c('curl')->getcurl($url); + if(!$result)$result = $this->mapqqerr(); + return $result; + } + } + + //杞潗鏍 + public function translate($lat, $lng, $type) + { + if(!$this->mapqq_key){ + $barr = c('xinhuapi')->getdata('mapqq','translate', array( + 'lat' => $lat, + 'lng' => $lng, + 'type'=> $type + )); + if(!$barr['success'])return $this->mapqqerr($barr['msg']); + return $barr['data']; + }else{ + $url = 'https://apis.map.qq.com/ws/coord/v1/translate?key='.$this->mapqq_key.''; + $url.= '&locations='.$lat.','.$lng.''; + $url.= '&type='.$type.''; + $result = c('curl')->getcurl($url); + if(!$result)$result = $this->mapqqerr(); + return $result; + } + } + + //鎼滅储$key 鏄痓ase64 + public function suggestion($keyword) + { + if(!$this->mapqq_key){ + $barr = c('xinhuapi')->getdata('mapqq','suggestion', array( + 'keyword' => $keyword, + )); + if(!$barr['success'])return $this->mapqqerr($barr['msg']); + return $barr['data']; + }else{ + $keyword = $this->rock->jm->base64decode($keyword); + $keyarr = explode(' ', $keyword); + $url = 'https://apis.map.qq.com/ws/place/v1/suggestion?key='.$this->mapqq_key.''; + $url .= '&keyword='.$keyarr[0].''; + if(isset($keyarr[1]))$url.= '®ion='.$keyarr[1].''; + $result = c('curl')->getcurl($url); + if(!$result)$result = $this->mapqqerr(); + return $result; + } } } \ No newline at end of file diff --git a/js/dingwei.js b/js/dingwei.js index 5f37496..d76636b 100644 --- a/js/dingwei.js +++ b/js/dingwei.js @@ -30,10 +30,12 @@ js.dw = { ondwcall:function(){}, ondwstart:function(){}, ondwerr:function(){}, + successbo:false, ondwwait:function(){return false}, start:function(){ if(this.dwbool)return; + this.successbo = false; this.dwbool = true; this.chaoshi(); this.ondwstart(js.jssdkstate); @@ -158,10 +160,9 @@ js.dw = { baiduLocationSuc:function(ret,err){ if(ret.status && ret.latitude){ - this.wait('瀹氫綅鎴愬姛锛岃幏鍙栦綅缃俊鎭...'); + this.wait('鐧惧害瀹氫綅鎴愬姛锛岃幏鍙栦綅缃俊鎭...'); if(!ret.accuracy)ret.accuracy = 200; - var center = new qq.maps.LatLng(ret.latitude,ret.longitude); - this.translate(center, ret.accuracy, 3); + this.translate(ret.latitude, ret.longitude, ret.accuracy, 3); }else{ this.dwshibai('瀹氫綅澶辫触锛屾鏌ユ槸鍚︾粰APP寮瀹氫綅鏉冮檺'); } @@ -200,83 +201,137 @@ js.dw = { break; } if(NOWURL.substr(0,5)!='https')msg+='蹇呴』浣跨敤https璁块棶'; - js.msg('msg', msg); - js.dw.ondwerr(msg); + js.dw.timeerrbo = setTimeout(function(){ + if(!js.dw.successbo){ + js.msg('msg', msg); + js.dw.ondwerr(msg); + }else{ + js.msg(); + } + },1000); }, showPosition:function(position){ + js.dw.successbo = true; + clearTimeout(js.dw.timeerrbo); + js.msg(); var res = position.coords; var latitude = res.latitude; var longitude = res.longitude; var accuracy = parseFloat(res.accuracy); - var center = new qq.maps.LatLng(parseFloat(latitude), parseFloat(longitude)); - js.dw.translate(center, accuracy, 1); + js.dw.translate(latitude,longitude, accuracy, 1); }, //鍧愭爣杞寲type1鍘熷 - translate:function(center, accuracy, type){ - qq.maps.convertor.translate(center,type,function(res){ - var latitude = res[0].lat; - var longitude = res[0].lng; - if(latitude==0 || latitude==0){ - js.dw.dwshibai('鏃犳硶鑾峰彇浣嶇疆淇℃伅澶辫触'); - }else{ - js.dw.dwsuccess({ - latitude:latitude, - longitude:longitude, - accuracy:accuracy - }); + translate:function(lat, lng,juli, type){ + $.ajax({ + url:'api.php?m=kaoqin&a=translate', + data:{ + lat:lat, + lng:lng, + type:type + }, + dataType:'json', + success:function(ret){ + if(ret.status==0){ + js.dw.dwsuccess({ + latitude:ret.locations[0].lat, + longitude:ret.locations[0].lng, + accuracy:juli + }); + }else{ + js.dw.dwshibai('鏃犳硶杞寲鍧愭爣('+lat+','+lng+'),'+type+'
'+ret.status+','+ret.message+''); + } + }, + error:function(){ + js.dw.dwshibai('鏃犳硶杞寲鍧愭爣'+type+''); } - }); + }); }, - //鎼滅储浣嶇疆 + //鎼滅储浣嶇疆,2024-07-19鏀 geocoder:function(lat,lng, jid){ - if(!this.geocoderObj)this.geocoderObj = new qq.maps.Geocoder(); - var center = new qq.maps.LatLng(lat, lng); - this.geocoderObj.getAddress(center); - this.geocoderObj.setComplete(function(result){ - var address = result.detail.address; - var dzarr = result.detail.addressComponents; - //address = ''+dzarr.province+''+dzarr.city+''+dzarr.district+''+dzarr.street+''; - //if(dzarr.streetnumber)address+=dzarr.streetnumber; - - //鑼冨洿鍐呭湴鍧 - var near = result.detail.nearPois,dist = 500,naddress,addressinfo; - for(var i=0;i0)addressinfo+='(绮剧‘'+js.float(jid,1)+'绫)'; + js.msg(); + errcan.address = address; + errcan.addressinfo = addressinfo; + errcan.detail = result; + js.dw.ondwcall(errcan); + }else{ + if(ret.message)js.msg('msg', ret.status+':'+ret.message); + js.dw.ondwcall(errcan); } + }, + error:function(){ + js.dw.ondwcall(errcan); } - if(dist<500)address = naddress; - addressinfo = ''+address; - if(jid>0)addressinfo+='(绮剧‘'+jid+'绫)'; - js.msg(); - js.dw.ondwcall({ - latitude:lat, - longitude:lng, - accuracy:jid, - address:address, - addressinfo:addressinfo, - detail:result.detail, - center:center - }); }); - - this.geocoderObj.setError(function() { - //var msg = '鏃犳硶鑾峰彇浣嶇疆';js.msg('msg', msg);js.dw.ondwerr(msg); - js.msg(); - js.dw.ondwcall({ - latitude:lat, - longitude:lng, - accuracy:jid, - address:'鏈煡浣嶇疆', - addressinfo:'瀹氫綅鎴愬姛鏈煡浣嶇疆', - detail:'鏈煡浣嶇疆', - center:center + }, + + //璁＄畻璺濈,old + matrix:function(lat,lng, kqarr, funs){ + var fromstr = ''+lat+','+lng+'',tostr=''; + for(var i=0;i0)tostr+=';'; + tostr +=''+kqarr[i].location_x+','+kqarr[i].location_y+''; + } + if(fromstr && tostr){ + $.ajax({ + url:'api.php?m=kaoqin&a=matrix', + data:{ + fromstr:fromstr, + tostr:tostr, + }, + dataType:'json', + success:function(ret){ + if(ret.status==0){ + var rows = ret.result.rows[0].elements; + for(var j=0;j-1 || d1.name.toLowerCase().indexOf(key)>-1 || d1.value==key || (d1.subname && d1.subname.indexOf(key)>-1)){ + if(d1.name)if(d1.name.indexOf(key)>-1 || d1.name.toLowerCase().indexOf(key)>-1 || d1.value==key || (d1.subname && d1.subname.indexOf(key)>-1)){ d.push(d1); oi++; if(oi>20)break;//鏈澶氭樉绀烘悳绱 diff --git a/webmain/flow/input/inputjs/input_two.js b/webmain/flow/input/inputjs/input_two.js index 83227ea..92efae0 100644 --- a/webmain/flow/input/inputjs/input_two.js +++ b/webmain/flow/input/inputjs/input_two.js @@ -315,9 +315,9 @@ var inputtwo={ //2020-09-02鏂板鍦板浘涓婇夋嫨浣嶇疆 selectmap:function(sna,snall,fna,iszb){ var hei = winHb()-150; - var url = 'https://map.qq.com/api/js?v=2.exp&libraries=convertor,geometry&key=55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7&callback=c.showmap'; + var url = 'https://map.qq.com/api/js?v=2.exp&key=55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7&callback=c.showmap'; js.tanbody('selectmap','閫夋嫨['+fna+']',winWb()-((ismobile==1)?5:80),hei,{ - html:'
', + html:'
', btn:[{text:'纭畾'}] }); this.selectmapdata={sna:sna,snall:snall}; @@ -328,6 +328,9 @@ var inputtwo={ c.selectmapque(); js.tanclose('selectmap'); }); + $('#selectmap_btn1').click(function(){ + c.selectmapdinwei(); + }); }, selectmapclear:function(sna,snall){ if(form(sna))form(sna).value=''; @@ -353,13 +356,19 @@ var inputtwo={ }, selectmapsou:function(o1){ var val = o1.value; - if(!val || isNaN(val))return; - if(!this.citylocation)this.citylocation = new qq.maps.CityService({ - complete : function(result){ - map.setCenter(result.detail.latLng); + if(!val)return; + js.msg('wait','鎼滅储涓...'); + js.ajax('api.php?m=kaoqin&a=suggestion',{key:jm.base64encode(val)},function(ret){ + js.msg(); + if(ret.status==0){ + var res = ret.data[0]; + var center = new qq.maps.LatLng(res.location.lat,res.location.lng); + map.setCenter(center); + marker.setPosition(center); + }else{ + js.msg('msg',ret.message); } - }); - this.citylocation.searchCityByAreaCode(val); + },'get,json'); }, selectmapque:function(){ var as = marker.getPosition(); @@ -374,12 +383,21 @@ var inputtwo={ }, //鎼滅储浣嶇疆 geocoder:function(lat,lng, jid){ - if(!this.geocoderObj){ - this.geocoderObj = new qq.maps.Geocoder(); - this.geocoderObj.setComplete(function(result){ + js.ajax('api.php?m=kaoqin&a=gcoder',{lat:lat,lng:lng},function(ret){ + js.msg(); + if(ret.status==0){ + var result = ret.result; + var address= result.formatted_addresses.recommend; var d1 = c.selectmapdata; - d1.address = result.detail.address; - d1.addressinfo = result.detail.addressComponents; + d1.address = address; + var info = result.address_component; + d1.addressinfo = { + province:info.province, + city:info.city, + town:info.district, + streetNumber:info.street_number, + street:info.street + }; js.msg(); var sna = d1.sna; if(form(sna))form(sna).value=d1.address+'|'+d1.lat+','+d1.lng+''; @@ -389,13 +407,10 @@ var inputtwo={ form(sna).value=d1.address; } c.onselectmap(sna,d1); - }); - this.geocoderObj.setError(function() { - js.msg('msg','鎼滅储鍦板潃澶辫触'); - }); - } - var center = new qq.maps.LatLng(lat, lng); - this.geocoderObj.getAddress(center); + }else{ + js.msg('msg',ret.message); + } + },'get,json'); }, xuanfile:function(fid,lx,fname,o1){ if(!fname)fname=''; diff --git a/webmain/flow/input/mode_gongAction.php b/webmain/flow/input/mode_gongAction.php index 8ad9280..1714d3a 100644 --- a/webmain/flow/input/mode_gongAction.php +++ b/webmain/flow/input/mode_gongAction.php @@ -23,8 +23,8 @@ class mode_gongClassAction extends inputAction{ //鎻愪氦鎶曠エ public function submittoupiaoAjax() { - $mid = $this->get('mid'); - $sid = $this->get('sid'); + $mid = (int)$this->get('mid'); + $sid = c('check')->onlynumber($this->get('sid')); $modenum = $this->get('modenum'); $this->flow = m('flow')->initflow($modenum); diff --git a/webmain/flow/input/mode_knowtraimAction.php b/webmain/flow/input/mode_knowtraimAction.php index e6a6a26..632a723 100644 --- a/webmain/flow/input/mode_knowtraimAction.php +++ b/webmain/flow/input/mode_knowtraimAction.php @@ -292,7 +292,7 @@ class mode_knowtraimClassAction extends inputAction{ //鏍囪瘑鍙噸鏂拌冭瘯 public function biaoshiAjax() { - $fid = $this->post('fid','0'); + $fid = c('check')->onlynumber($this->post('fid','0')); m('knowtrais')->update(array( 'kssdt' => '', 'ksedt' => '', diff --git a/webmain/flow/input/mode_userAction.php b/webmain/flow/input/mode_userAction.php index 818619d..1c34d96 100644 --- a/webmain/flow/input/mode_userAction.php +++ b/webmain/flow/input/mode_userAction.php @@ -131,8 +131,8 @@ class mode_userClassAction extends inputAction{ public function editsuperAjax() { $sna = $this->post('sna'); - $sid = $this->post('sid'); - $xid = $this->post('xid'); + $sid = c('check')->onlynumber($this->post('sid')); + $xid = c('check')->onlynumber($this->post('xid')); m('admin')->update(array( 'superid' => $sid, 'superman' => $sna, diff --git a/webmain/install/rockxinhu.sql b/webmain/install/rockxinhu.sql index 5327a04..377c869 100644 --- a/webmain/install/rockxinhu.sql +++ b/webmain/install/rockxinhu.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50610 File Encoding : 65001 -Date: 2024-05-04 17:50:20 +Date: 2024-07-31 12:52:18 */ SET FOREIGN_KEY_CHECKS=0; @@ -71,14 +71,14 @@ CREATE TABLE `xinhu_admin` ( -- ---------------------------- -- Records of xinhu_admin -- ---------------------------- -INSERT INTO `xinhu_admin` VALUES ('1', 'A001', 'admin', '绠＄悊鍛', 'e10adc3949ba59abbe56e057f20f883e', '5791', '1', '1', '鐢', '0592-1234569', 'upload/face/1.jpg', '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '5', '纾愮煶', '椤圭洰涓荤', '1', '[1],[2]', '[5]', '1,3,4', '15800000023', '1', '2016-06-01', null, '2017-03-08 09:52:30', null, null, null, '0', 'guanliyuan', null, '1', '0', null, '1', null, null, '0', '1'); +INSERT INTO `xinhu_admin` VALUES ('1', 'A001', 'admin', '绠＄悊鍛', 'e10adc3949ba59abbe56e057f20f883e', '5900', '1', '1', '鐢', '0592-1234569', 'upload/face/1.jpg', '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '5', '纾愮煶', '椤圭洰涓荤', '1', '[1],[2]', '[5]', '1,3,4', '15800000023', '1', '2016-06-01', null, '2017-03-08 09:52:30', null, null, null, '0', 'guanliyuan', null, '1', '0', null, '1', null, null, '0', '1'); INSERT INTO `xinhu_admin` VALUES ('2', null, 'diaochan', '璨傝潐', 'e10adc3949ba59abbe56e057f20f883e', '193', '1', '0', '濂', '0592-123456', null, '3', '璐㈠姟閮', null, null, null, '淇″懠寮鍙戝洟闃/璐㈠姟閮', '5', '纾愮煶', '璐㈠姟鎬荤洃', '1', '[1],[3]', '[5]', '1,3', '15800000007', '1', '2016-08-09', null, null, null, null, null, '0', 'diaochan', null, '2', '0', null, '1', null, null, '0', '1'); INSERT INTO `xinhu_admin` VALUES ('3', null, 'xiaoqiao', '灏忎箶', 'e10adc3949ba59abbe56e057f20f883e', '342', '1', '0', '濂', null, null, '3', '璐㈠姟閮', null, null, null, '淇″懠寮鍙戝洟闃/璐㈠姟閮', '2', '璨傝潐', '鍑虹撼', '1', '[1],[3]', '[5],[2]', '1', '15800000001', '1', '2017-05-02', null, '2016-08-30 20:34:23', null, null, null, '0', 'xiaoqiao', null, '2', '0', null, '1', null, null, '0', '1'); -INSERT INTO `xinhu_admin` VALUES ('4', null, 'daqiao', '澶т箶', 'e10adc3949ba59abbe56e057f20f883e', '528', '1', '0', '濂', null, null, '4', '琛屾斂浜轰簨閮', '3', '璐㈠姟閮', '浼氳', '淇″懠寮鍙戝洟闃/琛屾斂浜轰簨閮', '5', '纾愮煶', '浜轰簨涓荤', '1', '[1],[4],[3]', '[5]', '1,3', '15800000002', '1', '2017-07-01', null, '2016-10-20 22:27:51', null, null, null, '0', 'daqiao', null, '2', '0', null, '1', null, null, '0', '1'); +INSERT INTO `xinhu_admin` VALUES ('4', null, 'daqiao', '澶т箶', 'e10adc3949ba59abbe56e057f20f883e', '530', '1', '0', '濂', null, null, '4', '琛屾斂浜轰簨閮', '3', '璐㈠姟閮', '浼氳', '淇″懠寮鍙戝洟闃/琛屾斂浜轰簨閮', '5', '纾愮煶', '浜轰簨涓荤', '1', '[1],[4],[3]', '[5]', '1,3', '15800000002', '1', '2017-07-01', null, '2016-10-20 22:27:51', null, null, null, '0', 'daqiao', null, '2', '0', null, '1', null, null, '0', '1'); INSERT INTO `xinhu_admin` VALUES ('5', null, 'rock', '纾愮煶', 'e10adc3949ba59abbe56e057f20f883e', '486', '1', '0', '鐢', null, null, '5', '绠＄悊灞', null, null, null, '淇″懠寮鍙戝洟闃/绠＄悊灞', null, null, '钁ｄ簨闀', '0', '[1],[5]', null, '2,3', '15800000003', '1', '2015-11-01', null, null, null, null, null, '0', 'panshi', null, '1', '0', null, '1', null, '1,2,3,4', '0', '1'); -INSERT INTO `xinhu_admin` VALUES ('6', null, 'zhangfei', '寮犻', 'e10adc3949ba59abbe56e057f20f883e', '267', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '7', '璧靛瓙榫', '绋嬪簭鍛', '100', '[1],[2]', '[5],[1],[7]', '1', '15800000004', '1', '2017-07-01', null, '2016-11-01 20:15:52', null, null, null, '0', 'zhangfei', null, '1', '0', null, '1', null, null, '0', '0'); -INSERT INTO `xinhu_admin` VALUES ('7', null, 'zhaozl', '璧靛瓙榫', 'e10adc3949ba59abbe56e057f20f883e', '333', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '1', '绠＄悊鍛', '楂樼骇绋嬪簭鍛', '100', '[1],[2]', '[5],[1]', '1', '15800000005', '1', '2016-07-01', null, '2017-06-28 15:34:26', null, null, null, '0', 'zhaozilong', null, '1', '0', null, '1', null, null, '0', '0'); -INSERT INTO `xinhu_admin` VALUES ('8', null, 'xinhu', '淇″懠瀹㈡湇', '6846860684f05029abccc09a53cd66f1', '430', '1', '1', '濂', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '1', '绠＄悊鍛', '瀹㈡湇', '200', '[1],[2]', '[5],[1]', '1,4', '15800000006', '1', '2018-12-12', null, null, null, 'rainrock829', null, '0', 'xinhukefu', null, '1', '0', null, '1', null, '2', '0', '1'); +INSERT INTO `xinhu_admin` VALUES ('6', null, 'zhangfei', '寮犻', 'e10adc3949ba59abbe56e057f20f883e', '277', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '7', '璧靛瓙榫', '绋嬪簭鍛', '100', '[1],[2]', '[5],[1],[7]', '1', '15800000004', '1', '2017-07-01', null, '2016-11-01 20:15:52', null, null, null, '0', 'zhangfei', null, '1', '0', null, '1', null, null, '0', '0'); +INSERT INTO `xinhu_admin` VALUES ('7', null, 'zhaozl', '璧靛瓙榫', 'e10adc3949ba59abbe56e057f20f883e', '343', '1', '0', '鐢', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '1', '绠＄悊鍛', '楂樼骇绋嬪簭鍛', '100', '[1],[2]', '[5],[1]', '1', '15800000005', '1', '2016-07-01', null, '2017-06-28 15:34:26', null, null, null, '0', 'zhaozilong', null, '1', '0', null, '1', null, null, '0', '0'); +INSERT INTO `xinhu_admin` VALUES ('8', null, 'xinhu', '淇″懠瀹㈡湇', '6846860684f05029abccc09a53cd66f1', '432', '1', '1', '濂', null, null, '2', '寮鍙戦儴', null, null, null, '淇″懠寮鍙戝洟闃/寮鍙戦儴', '1', '绠＄悊鍛', '瀹㈡湇', '200', '[1],[2]', '[5],[1]', '1,4', '15800000006', '1', '2018-12-12', null, null, null, 'rainrock829', null, '0', 'xinhukefu', null, '1', '0', null, '1', null, '2', '0', '1'); -- ---------------------------- -- Table structure for `xinhu_assetm` @@ -375,8 +375,8 @@ CREATE TABLE `xinhu_chargems` ( -- ---------------------------- -- Records of xinhu_chargems -- ---------------------------- -INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2024-05-04 17:50:07', null, '1'); -INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2024-05-04 17:50:07', null, '0'); +INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2024-07-31 12:51:33', null, '1'); +INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2024-07-31 12:51:33', null, '0'); -- ---------------------------- -- Table structure for `xinhu_city` @@ -1185,7 +1185,7 @@ CREATE TABLE `xinhu_flow_bill` ( KEY `table` (`table`,`mid`) USING BTREE, KEY `status` (`status`), KEY `modeid` (`modeid`) -) ENGINE=MyISAM AUTO_INCREMENT=399 DEFAULT CHARSET=utf8 COMMENT='娴佺▼鍗曟嵁'; +) ENGINE=MyISAM AUTO_INCREMENT=400 DEFAULT CHARSET=utf8 COMMENT='娴佺▼鍗曟嵁'; -- ---------------------------- -- Records of xinhu_flow_bill @@ -1439,10 +1439,10 @@ CREATE TABLE `xinhu_flow_course` ( -- ---------------------------- -- Records of xinhu_flow_course -- ---------------------------- -INSERT INTO `xinhu_flow_course` VALUES ('1', '0', '0', '5', '涓婄骇瀹℃牳', null, 'superall', null, null, '0', '0', null, null, '2021-09-01 16:12:07', '1', null, '1', null, '0', '0', null, null, null, '2', '0', null, '0', '4', null, null, '0', '0', '0', '0', null, null); -INSERT INTO `xinhu_flow_course` VALUES ('2', '1', '0', '5', '浜轰簨瀹℃牳', null, 'rank', null, '浜轰簨涓荤', '0', '0', null, null, '2018-05-07 09:47:03', '1', null, '1', null, '0', '0', null, null, null, '0', '0', '0', '0', '1', null, null, '0', '0', '0', '0', null, null); +INSERT INTO `xinhu_flow_course` VALUES ('1', '0', '0', '5', '涓婄骇瀹℃牳', null, 'super', null, null, '0', '0', null, null, '2024-06-22 16:54:28', '1', null, '1', null, '0', '0', null, null, null, '2', '0', null, '0', '4', null, null, '0', '0', '0', '0', null, null); +INSERT INTO `xinhu_flow_course` VALUES ('2', '1', '0', '5', '浜轰簨瀹℃牳', null, 'rank', null, '浜轰簨涓荤', '0', '0', null, null, '2024-06-22 16:54:23', '1', null, '1', null, '0', '0', null, null, null, '0', '0', null, '0', '1', null, null, '0', '0', '0', '0', null, null); INSERT INTO `xinhu_flow_course` VALUES ('3', '0', '0', '6', '涓婄骇瀹℃牳', null, 'super', null, null, '0', '0', null, null, '2016-07-02 22:25:29', '1', null, '1', null, '0', '0', null, null, null, '0', '0', '0', '0', '1', null, null, '0', '0', '0', '0', null, null); -INSERT INTO `xinhu_flow_course` VALUES ('4', '2', '0', '5', '鎬荤粡鐞嗗鏍', null, 'user', '5', '纾愮煶', '0', '2', null, '瓒呰繃3澶24灏忔椂', '2016-09-25 14:53:34', '1', null, '1', null, '0', '0', null, null, null, '0', '0', '0', '0', '1', null, null, '0', '0', '0', '0', null, null); +INSERT INTO `xinhu_flow_course` VALUES ('4', '2', '0', '5', '鎬荤粡鐞嗗鏍', null, 'user', '5', '纾愮煶', '0', '2', null, '瓒呰繃3澶24灏忔椂', '2024-06-22 16:54:33', '1', null, '1', null, '0', '0', null, null, null, '0', '0', null, '0', '1', null, null, '0', '0', '0', '0', null, null); INSERT INTO `xinhu_flow_course` VALUES ('5', '0', '0', '23', '涓婄骇瀹℃牳', null, 'super', null, null, '0', '0', null, null, '2016-08-27 08:46:27', '1', null, '1', null, '0', '0', null, null, null, '0', '0', '0', '0', '1', null, null, '0', '0', '0', '0', null, null); INSERT INTO `xinhu_flow_course` VALUES ('6', '0', '0', '24', '琛屾斂鍙戞斁', null, 'user', '4', '澶т箶', '0', '0', null, null, '2017-08-10 11:42:24', '1', '鍙戞斁,椹冲洖|red', '1', null, '0', '0', null, null, null, '0', '0', '0', '0', '1', null, null, '0', '0', '0', '0', null, null); INSERT INTO `xinhu_flow_course` VALUES ('7', '0', '0', '11', '涓婄骇瀹℃壒', null, 'super', null, null, '0', '0', null, null, '2016-09-02 17:36:36', '1', null, '1', null, '0', '0', null, null, null, '0', '0', '0', '0', '1', null, null, '0', '0', '0', '0', null, null); @@ -3007,7 +3007,7 @@ CREATE TABLE `xinhu_flow_log` ( `iszb` tinyint(1) DEFAULT '0' COMMENT '鏄惁杞姙璁板綍', PRIMARY KEY (`id`), KEY `table` (`table`,`mid`) -) ENGINE=MyISAM AUTO_INCREMENT=4934 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鎿嶄綔璁板綍'; +) ENGINE=MyISAM AUTO_INCREMENT=4941 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鎿嶄綔璁板綍'; -- ---------------------------- -- Records of xinhu_flow_log @@ -3547,6 +3547,7 @@ INSERT INTO `xinhu_flow_log` VALUES ('4923', 'flow_element', '1816', '1', null, INSERT INTO `xinhu_flow_log` VALUES ('4929', 'flow_element', '1817', '1', null, '鎻愪氦', '0', '2024-05-04 17:22:12', null, '127.0.0.1', 'Chrome', '绠＄悊鍛', '1', '159', null, '1', '0', null, '0'); INSERT INTO `xinhu_flow_log` VALUES ('4930', 'flow_element', '1818', '1', null, '鎻愪氦', '0', '2024-05-04 17:23:28', null, '127.0.0.1', 'Chrome', '绠＄悊鍛', '1', '159', null, '1', '0', null, '0'); INSERT INTO `xinhu_flow_log` VALUES ('4931', 'flow_element', '1819', '1', null, '鎻愪氦', '0', '2024-05-04 17:23:59', null, '127.0.0.1', 'Chrome', '绠＄悊鍛', '1', '159', null, '1', '0', null, '0'); +INSERT INTO `xinhu_flow_log` VALUES ('4939', 'flow_remind', '16', '1', null, '鎻愪氦', '0', '2024-07-28 16:44:41', null, '127.0.0.1', 'Chrome', '绠＄悊鍛', '1', '61', null, '1', '0', null, '0'); -- ---------------------------- -- Table structure for `xinhu_flow_menu` @@ -3692,7 +3693,7 @@ CREATE TABLE `xinhu_flow_remind` ( UNIQUE KEY `table` (`uid`,`table`,`mid`) USING BTREE, UNIQUE KEY `uid` (`uid`,`modenum`,`mid`), KEY `table_2` (`table`,`mid`) -) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鎻愰啋璁剧疆琛'; +) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='鍗曟嵁鎻愰啋璁剧疆琛'; -- ---------------------------- -- Records of xinhu_flow_remind @@ -3703,6 +3704,7 @@ INSERT INTO `xinhu_flow_remind` VALUES ('8', '2017-09-03 20:11:29', null, '1', ' INSERT INTO `xinhu_flow_remind` VALUES ('10', '2018-12-04 09:23:47', null, '1', '2020-09-01 17:57:41', '绠＄悊鍛', 'flowtodo', 'flow_todo', '11', '姣忓ぉ 08:00:00', '鐗╁搧搴撳瓨棰勮灏忎簬10鎻愰啋銆', 'd', '08:00:00', '0', null, null, '1'); INSERT INTO `xinhu_flow_remind` VALUES ('11', '2019-12-02 15:43:47', null, '1', '2021-04-13 19:37:54', '绠＄悊鍛', 'flowtodo', 'flow_todo', '16', '姣忓ぉ 19:40:00', '瀹㈡埛鈥渰custname}鈥濆緟鏀堕噾棰濓細{money}', 'd', '19:40:00', '1', null, null, '1'); INSERT INTO `xinhu_flow_remind` VALUES ('12', '2020-10-01 12:14:50', null, '1', '2020-10-13 15:42:49', '绠＄悊鍛', 'flowtodo', 'flow_todo', '20', '姣忓ぉ 15:45:45', '{mingc}灏嗗湪{etime}鍒版湡', 'd', '15:45:45', '1', null, null, '1'); +INSERT INTO `xinhu_flow_remind` VALUES ('16', '2024-07-28 16:44:24', null, '1', '2024-07-28 16:44:41', '绠＄悊鍛', 'work', 'work', '11', '浠呬竴娆 2024-07-28 16:50:00', '浠诲姟锛歔bug]娴嬭瘯浠诲姟,鍒嗛厤缁:淇″懠瀹㈡湇', 'o', '2024-07-28 16:50:00', '1', 'u1', '绠＄悊鍛', '1'); -- ---------------------------- -- Table structure for `xinhu_flow_set` @@ -3754,7 +3756,7 @@ CREATE TABLE `xinhu_flow_set` ( -- ---------------------------- -- Records of xinhu_flow_set -- ---------------------------- -INSERT INTO `xinhu_flow_set` VALUES ('1', '閫氱煡鍏憡', 'gong', '1', 'infor', null, '[{typename}]{title}', 'title:[{typename}]{title}\noptdt:{optdt}', '琛屾斂', '1', '0', '0', '0', 'XA-Ymd-', '0', 'all', '鍏ㄤ綋浜哄憳', '2024-03-13 16:52:47', '1', '1', 'infors', '鎶曠エ椤圭洰', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', null, '0'); +INSERT INTO `xinhu_flow_set` VALUES ('1', '閫氱煡鍏憡', 'gong', '1', 'infor', null, '[{typename}]{title}', 'title:[{typename}]{title}\noptdt:{optdt}', '琛屾斂', '1', '0', '0', '0', 'XA-Ymd-', '0', 'all', '鍏ㄤ綋浜哄憳', '2024-06-20 16:43:52', '1', '1', 'infors', '鎶曠エ椤圭洰', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('2', '浼氳', 'meet', '2', 'meet', '`type` in(0,1)', '[{hyname}]{title},{startdt}鈫抺enddt}', 'title:{title}\ncont:浼氳瀹わ細{hyname}[br]鍙戣捣浜猴細{optname}[br]鍙備細浜猴細{joinname}\noptdt:{startdt}鈫抺enddt}', '琛屾斂', '1', '0', '0', '0', 'XB-Ymd-', '0', 'all', '鍏ㄤ綋浜哄憳', '2019-06-03 13:54:09', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('3', '宸ヤ綔鏃ユ姤', 'daily', '21', 'daily', null, '[{optname}]{content}', 'title:[{optname}]{dt}鐨剓type}\noptdt:{optdt}\ncont:{content}', '鍩虹', '1', '0', '0', '0', 'XC-Ymd-', '0', 'all', '鍏ㄤ綋浜哄憳', '2021-05-08 09:23:14', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '1', '0', '1', '1', '0', '1', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('4', '浠诲姟', 'work', '23', 'work', null, '[{type}]{title},鍒嗛厤缁:{dist}', 'title:{title}\noptdt:{optdt}\ncont:绫诲瀷锛歿type}[br]绛夌骇锛歿grade}[br]鍒嗛厤缁欙細{dist}[br]鍒涘缓鑰咃細{optname}[br]鎴鏃堕棿锛歿enddt}', '鍩虹', '1', '0', '0', '0', 'XW-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2021-04-01 10:18:34', '1', '1', null, null, '寰?鍒嗛厤,宸插畬鎴,鏃犳硶瀹屾垚,寰?鎵ц,?鎵ц涓,宸蹭綔搴,寰?楠岃瘉|blue', '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0'); @@ -3765,7 +3767,7 @@ INSERT INTO `xinhu_flow_set` VALUES ('8', '閿鍞満浼', 'custsale', '52', 'cus INSERT INTO `xinhu_flow_set` VALUES ('9', '鐗╁搧', 'goods', '80', 'goods', null, '鍚嶇О锛歿name}锛岀紪鍙凤細{num}', 'title:{name}\ncont:缂栧彿锛歿num}[br]瑙勬牸锛歿guige}[br]鍨嬪彿锛歿xinghao}[br]搴撳瓨锛歿stock}{unit}', '鐗╁搧', '1', '0', '0', '0', 'CC-Ymd-', '0', 'all', '鍏ㄤ綋浜哄憳', '2020-05-30 18:50:17', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('11', '璐圭敤鎶ラ攢', 'finfybx', '90', 'fininfom', 'type=0', '鎶ラ攢锛歿money},鏀舵浜猴細{fullname}', null, '璐㈠姟', '1', '0', '0', '0', 'FA-Ymd-', '1', 'all', '鍏ㄤ綋浜哄憳', '2019-06-07 14:16:05', '1', '1', 'fininfos', '鎶ラ攢鏄庣粏', null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('10', '鐢ㄦ埛', 'user', '901', 'admin', null, '{deptallname}锛寋name}', 'title:{name}\ncont:閮ㄩ棬锛歿deptallname}[br]鑱屼綅锛歿ranking}[br]鐢佃瘽锛歿tel}[br]鎵嬫満锛歿mobile}[br]閭锛歿email}', '绯荤粺', '0', '0', '0', '0', null, '0', 'u1', '绠＄悊鍛', '2019-06-17 09:34:13', '1', '0', null, null, null, '0', '0', '1', '1', '0', '0', '2', '0', '0', '0', '0', '0', '0', '0', null, '0'); -INSERT INTO `xinhu_flow_set` VALUES ('12', '鏃ョ▼', 'schedule', '24', 'schedule', null, '{title}', 'title:{title}\noptdt:{optdt}\ncont:鏃堕棿锛歿startdt}[br]鎴锛歿enddt}[br]璇存槑锛歿explain}[br]閲嶅锛歿rate}{rateval}[br]鎻愰啋锛歿txsj}', '鍩虹', '1', '0', '0', '0', null, '0', 'all', '鍏ㄤ綋浜哄憳', '2019-06-03 17:12:10', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0'); +INSERT INTO `xinhu_flow_set` VALUES ('12', '鏃ョ▼', 'schedule', '24', 'schedule', null, '{title}', 'title:{title}\noptdt:{optdt}\ncont:鏃堕棿锛歿startdt}[br]鎴锛歿enddt}[br]璇存槑锛歿explain}[br]閲嶅锛歿rate}[br]鎻愰啋锛歿txsj}', '鍩虹', '1', '0', '0', '0', null, '0', 'all', '鍏ㄤ綋浜哄憳', '2024-07-10 16:47:04', '1', '1', null, null, null, '0', '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('13', '閮ㄩ棬', 'dept', '902', 'dept', null, '{name}', null, '绯荤粺', '0', '0', '0', '0', null, '0', 'u1', '绠＄悊鍛', '2019-06-03 17:25:41', '1', '0', null, null, null, '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('14', '绯荤粺缁', 'group', '903', 'group', null, null, null, '绯荤粺', '0', '0', '0', '0', null, '0', 'u1', '绠＄悊鍛', '2016-08-13 17:47:58', '1', '0', null, null, null, '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); INSERT INTO `xinhu_flow_set` VALUES ('15', '璁″垝浠诲姟', 'task', '904', 'task', null, null, null, '绯荤粺', '0', '0', '0', '0', null, '0', 'u1', '绠＄悊鍛', '2016-08-13 17:23:01', '1', '0', null, null, null, '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0'); @@ -5405,13 +5407,13 @@ CREATE TABLE `xinhu_im_history` ( -- ---------------------------- -- Records of xinhu_im_history -- ---------------------------- -INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2024-05-04 17:42:32', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2024-07-31 12:45:17', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2024-07-31 12:45:17', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2024-07-31 12:45:17', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2024-07-31 12:45:17', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2024-07-31 12:45:17', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2024-07-31 12:45:17', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); +INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2024-07-31 12:45:18', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0'); -- ---------------------------- -- Table structure for `xinhu_im_menu` @@ -5663,7 +5665,7 @@ CREATE TABLE `xinhu_im_mess` ( -- ---------------------------- -- Records of xinhu_im_mess -- ---------------------------- -INSERT INTO `xinhu_im_mess` VALUES ('1', '2024-05-04 17:42:32', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null); +INSERT INTO `xinhu_im_mess` VALUES ('1', '2024-07-31 12:45:17', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null); -- ---------------------------- -- Table structure for `xinhu_im_messzt` @@ -5743,7 +5745,7 @@ CREATE TABLE `xinhu_infor` ( -- ---------------------------- INSERT INTO `xinhu_infor` VALUES ('1', '娆㈣繋浣跨敤淇″懠宸ヤ綔鍙', '2018-04-26 17:27:10', '閫氱煡鍏憡', '

\n 娆㈣繋浣跨敤锛屾湁浠讳綍闂鍙互闅忔椂鑱旂郴鎴戜滑锛屽府浣犺В绛斿摝銆 \n

\n

\n 淇″懠鏄竴娆惧紑婧愬厤璐圭殑宸ヤ綔鍙拌蒋浠讹紝鍙坊鍔犲簲鐢紝绠＄悊锛宲c涓婏紝app閮藉彲浠ヤ娇鐢紝鎴戜滑鐨勪唬鐮佸叏閮ㄥ紑鏀撅紝鍙嚜鐢变娇鐢ㄣ俓n

', null, null, null, '1', '绠＄悊鍛', null, null, '淇″懠寮鍙戝洟闃', '2016-08-01', '1', null, '0', '0', '0', '0', null, null, '0', '0', '0'); INSERT INTO `xinhu_infor` VALUES ('2', '鍏充簬鍐欐棩鎶ュ埗搴﹁鏄', '2019-04-13 19:54:43', '瑙勫垯鍒跺害', '

\n 1銆佹瘡涓汉宸ヤ綔鏃ュ湪涓嬬彮鍚庡繀椤诲啓宸ヤ綔鏃ユ姤锛屽叏澶╄鍋囧彲涓嶇敤鍐欙紝鍙鏈変笂鐝氨闇瑕佸啓锛屽嵆浣夸綘涓婄彮1鍒嗛挓銆俓n

\n

\n 2銆佷篃鍙互闅斿ぉ鍐欍俓n

\n

\n 鏈啓澶勭綒 \n

\n

\n 1銆佹湭鍐欎竴娆℃墸浜斿潡锛岀疮璁″姞鍊嶃俓n

', null, 'u1,u2,u3,u4,u5,u6,u7,u8,u9', null, '1', '绠＄悊鍛', null, null, '浜哄姏琛屾斂閮', '2016-08-01', '1', 'images/kqbanner1.jpg', '0', '0', '0', '0', null, null, '0', '0', '0'); -INSERT INTO `xinhu_infor` VALUES ('6', '淇″懠鏇存柊鍙戝竷V2.6.3鐗堟湰', '2024-05-04 17:09:14', '閫氱煡鍏憡', '

\n 鐗堟湰娣诲姞浜嗗彂甯冨涓嬪姛鑳藉晩銆俓n

\n

\n 1銆佺郴缁熷姛鑳藉畬鍠勩俓n

\n

\n 2銆佹洿鏂颁簡寰堝锛岃嚜宸辩湅鍗囩骇鏃ュ織銆俓n

', 'http://www.rockoa.com/view_down.html', 'd1', '淇″懠寮鍙戝洟闃', '1', '绠＄悊鍛', null, null, '淇″懠寮鍙戝洟闃', '2024-05-04', '1', 'images/logo.png', '0', '0', '0', '1', null, null, '1', '1', '0'); +INSERT INTO `xinhu_infor` VALUES ('6', '淇″懠鏇存柊鍙戝竷V2.6.4鐗堟湰', '2024-07-31 12:27:30', '閫氱煡鍏憡', '

\n 鐗堟湰娣诲姞浜嗗彂甯冨涓嬪姛鑳藉晩銆俓n

\n

\n 1銆佺郴缁熷姛鑳藉畬鍠勩俓n

\n

\n 2銆佹洿鏂颁簡寰堝锛岃嚜宸辩湅鍗囩骇鏃ュ織銆俓n

', 'http://www.rockoa.com/view_down.html', 'd1', '淇″懠寮鍙戝洟闃', '1', '绠＄悊鍛', null, null, '淇″懠寮鍙戝洟闃', '2024-07-31', '1', 'images/logo.png', '0', '0', '0', '1', null, null, '1', '1', '0'); INSERT INTO `xinhu_infor` VALUES ('9', '浣犱滑瑙夊緱杩欎釜绯荤粺濡備綍锛', '2019-06-03 13:17:05', '閫氱煡鍏憡', '寮濮嬫姇绁ㄦ媺銆', null, 'd1', '淇″懠寮鍙戝洟闃', '1', '绠＄悊鍛', '2018-08-31 12:42:00', '2017-08-26 12:42:00', '寮鍙戦儴', '2017-08-26', '1', null, '1', '1', '0', '0', '2019-04-15', null, '1', '0', '0'); -- ---------------------------- @@ -6020,7 +6022,7 @@ CREATE TABLE `xinhu_kqdw` ( -- ---------------------------- -- Records of xinhu_kqdw -- ---------------------------- -INSERT INTO `xinhu_kqdw` VALUES ('1', '鍘﹂棬榛樿浣嶇疆', '24.528153', '118.167806', '鍘﹂棬', '0', '12', null, '1', null, '0'); +INSERT INTO `xinhu_kqdw` VALUES ('1', '鍘﹂棬榛樿浣嶇疆', '24.528153', '118.167806', '鍘﹂棬', '100', '12', null, '1', null, '0'); -- ---------------------------- -- Table structure for `xinhu_kqerr` @@ -6079,7 +6081,7 @@ CREATE TABLE `xinhu_kqinfo` ( PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `kind` (`kind`) -) ENGINE=MyISAM AUTO_INCREMENT=169 DEFAULT CHARSET=utf8 COMMENT='璇峰亣鏉″姞鐝崟'; +) ENGINE=MyISAM AUTO_INCREMENT=170 DEFAULT CHARSET=utf8 COMMENT='璇峰亣鏉″姞鐝崟'; -- ---------------------------- -- Records of xinhu_kqinfo diff --git a/webmain/install/tpl_install.html b/webmain/install/tpl_install.html index b17f488..206022a 100644 --- a/webmain/install/tpl_install.html +++ b/webmain/install/tpl_install.html @@ -21,7 +21,7 @@
瀹夎浣跨敤鍓嶅繀璇伙細

鎴戜滑缃戠珯锛

-

浜у搧鍚嶇О锛氫俊鍛

+

浜у搧鍚嶇О锛氫俊鍛糘A

婧愮爜浠呬緵瀛︿範寮鍙戜娇鐢紝绂佹鍘熷皝涓嶅姩鍑哄敭銆

鐗堟潈鏉ヨ嚜锛氫俊鍛煎紑鍙戝洟闃燂紝浜屾寮鍙戣鏍囪瘑鏉ヨ嚜銆婁俊鍛笺嬨

diff --git a/webmain/main/flow/flowAction.php b/webmain/main/flow/flowAction.php index 50fb76d..628318e 100644 --- a/webmain/main/flow/flowAction.php +++ b/webmain/main/flow/flowAction.php @@ -94,16 +94,23 @@ class flowClassAction extends Action $num = strtolower($cans['num']); $cobj= c('check'); if(!$cobj->iszgen($tab))return '琛ㄥ悕鏍煎紡涓嶅'; + $bobg = preg_replace("/[a-zA-Z0-9_]/",'', $tab); + if($bobg)return '琛ㄥ悕绂佺敤:'.$bobg.''; if($cobj->isnumber($num))return '缂栧彿涓嶈兘涓烘暟瀛'; if(strlen($num)<4)return '缂栧彿鑷冲皯瑕4浣'; if($cobj->isincn($num))return '缂栧彿涓嶈兘鍖呭惈涓枃'; if(contain($num,'-'))return '缂栧彿涓嶈兘鏈-'; + $bobg = preg_replace("/[a-zA-Z0-9_]/",'', $num); + if($bobg)return '妯″潡缂栧彿绂佺敤:'.$bobg.''; + if($cans['isflow']>0 && isempt($cans['sericnum'])) return '鏈夋祦绋嬪繀椤绘湁鍐欑紪鍙疯鍒欙紝璇峰弬鑰冨叾浠栨ā鍧楀～鍐'; $rows['num']= $this->rock->xssrepstr($num); $rows['name']= $name; if(!isempt($tabs)){ if($cobj->isincn($tabs))return '澶氳瀛愯〃鍚嶄笉鑳藉寘鍚腑鏂'; + $bobg = preg_replace("/[a-zA-Z0-9_,]/",'', $tabs); + if($bobg)return '瀛愯〃鍚嶇鐢:'.$bobg.''; $tabsa = explode(',', $tabs); $namea = explode(',', $names); foreach($tabsa as $k1=>$tabsas){ diff --git a/webmain/main/kaoqin/kaoqinAction.php b/webmain/main/kaoqin/kaoqinAction.php index ecd3f83..513ce1e 100644 --- a/webmain/main/kaoqin/kaoqinAction.php +++ b/webmain/main/kaoqin/kaoqinAction.php @@ -664,7 +664,7 @@ class kaoqinClassAction extends Action } if($this->rock->ismobile())$rs['type'] = 1; $this->smartydata['rs'] = $rs; - $this->smartydata['qqmapkey'] = getconfig('qqmapkey','55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7'); + $this->smartydata['qqmapkey'] = c('mapqq')->getkey(); } public function locationchangeAction() @@ -677,7 +677,7 @@ class kaoqinClassAction extends Action $this->assign('location_x', $location_x); $this->assign('location_y', $location_y); $this->assign('scale', $scale); - $this->smartydata['qqmapkey'] = getconfig('qqmapkey','55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7'); + $this->smartydata['qqmapkey'] = c('mapqq')->getkey(); } //鍒犻櫎鎵撳崱璁板綍 diff --git a/webmain/main/kaoqin/tpl_kaoqin_locationchange.html b/webmain/main/kaoqin/tpl_kaoqin_locationchange.html index e277d60..3b9a1cc 100644 --- a/webmain/main/kaoqin/tpl_kaoqin_locationchange.html +++ b/webmain/main/kaoqin/tpl_kaoqin_locationchange.html @@ -14,6 +14,8 @@ body, button, input, select, textarea { + + -
 鐐瑰湴鍥剧‘瀹氫綅缃紝[瀹氫綅]
+
 鐐瑰湴鍥剧‘瀹氫綅缃紝[瀹氫綅鎼滅储]
diff --git a/webmain/task/api/kaoqinAction.php b/webmain/task/api/kaoqinAction.php index ee7eeaf..3e15271 100644 --- a/webmain/task/api/kaoqinAction.php +++ b/webmain/task/api/kaoqinAction.php @@ -51,4 +51,26 @@ class kaoqinClassAction extends apiAction $this->showreturn($barr); } + + + + /** + * 鑵捐鍦板浘鍦板潃瑙ｆ瀽api.php?m=kaoqin&a=gcoder + */ + public function gcoderAction() + { + return c('mapqq')->gcoder($this->get('lat'), $this->get('lng')); + } + + //鍦板潃杞寲 + public function translateAction() + { + return c('mapqq')->translate($this->get('lat'), $this->get('lng'),(int)$this->get('type')); + } + + //鎼滅储 + public function suggestionAction() + { + return c('mapqq')->suggestion($this->get('key')); + } } \ No newline at end of file diff --git a/webmain/task/api/uploadAction.php b/webmain/task/api/uploadAction.php index 267746f..206d481 100644 --- a/webmain/task/api/uploadAction.php +++ b/webmain/task/api/uploadAction.php @@ -19,6 +19,10 @@ class uploadClassAction extends apiAction $updir=str_replace('{Year}',date('Y'), $updir); $updir=str_replace(array('{','}'),'', $updir); $updir=str_replace(',','|', $updir); + + $bobg = preg_replace("/[a-zA-Z0-9_]/",'', $updir); + $bobg = str_replace(array('-','|'),'', $bobg); + if($bobg)exit('stop:'.$bobg.''); } $upimg->initupfile($uptypes, ''.UPDIR.'|'.$updir.'', $maxsize); $upses = $upimg->up('file'); @@ -323,6 +327,7 @@ class uploadClassAction extends apiAction if(substr($filepath,0,4)!='http' && isempt($filepathout) && !file_exists($filepath))return returnerror('鏂囦欢涓嶅瓨鍦ㄤ簡1'); if(c('upfile')->isimg($fileext)){ $data['url'] = m('admin')->getface($filepath); + if(!isempt($filepathout))$data['url'] = $filepathout; } //涓嬭浇 if($type==1){ diff --git a/webmain/we/ying/tpl_ying_daka.html b/webmain/we/ying/tpl_ying_daka.html index 8fd69d8..4441d20 100644 --- a/webmain/we/ying/tpl_ying_daka.html +++ b/webmain/we/ying/tpl_ying_daka.html @@ -11,14 +11,17 @@ - - + +