daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.6.5版本

Browse Source
This commit is contained in:
雨中磐石
2024-08-01 12:20:59 +08:00
parent 79a1a21195
commit ddbeb70658
14 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -6,17 +6,17 @@
官网网站：http://www.rockoa.com/
源码仅供学习二次开发使用，禁止二次发布，禁止用于商业用途出售等(违者必究)
版权：Copyright @2016-2024 信呼开发团队
版本整理时间：2024-07-31 23:59:59
版本号：V2.6.4
版本整理时间：2024-08-01 23:59:59
版本号：V2.6.5
### V2.6.4更新说明
### V2.6.5更新说明
1、完善系统安全性。
2、更多升级日志详见：http://www.rockoa.com/view_core.html
### 安装说明
1、环境要求：可以运行在Win/Linux系统下，php5.2—7.3，mysql5.3—5.7
1、环境要求：可以运行在Win/Linux系统下，php5.2+，mysql5.3—5.7
2、测试环境搭建详见：http://www.rockoa.com/view_install.html
3、自己手动安装详见：http://www.rockoa.com/view_anzz.html
4、配置文件：webmain/webmainConfig.php，也可到【系统→系统工具→系统设置】下修改

4
config/version.php
View File

@@ -1,3 +1,3 @@
<?php
//版本2.6.4，2024-07-31
return '2.6.4';
//版本2.6.5，2024-08-01的版本
return '2.6.5';

10
include/rockFun.php
View File

@@ -292,4 +292,14 @@ function lang($str,$lx='')
$nstr = arrvalue($data[$str], $xuhao);
if(!$nstr)$nstr = $str;
return $nstr;
}
/**
* 为空替换为''
*/
function repempt($str,$dev='')
{
$s = $str;
if($s===null)$s=$dev;
return $s;
}

8
webmain/flow/input/mode_knowtraimAction.php
View File

@@ -43,7 +43,7 @@ class mode_knowtraimClassAction extends inputAction{
protected function saveafter($table, $arr, $id, $addbo){
$receid = $arr['receid'];
$ustrs = m('admin')->gjoin($arr['receid'],'ud');
$ustrsa = explode(',', $ustrs);
$ustrsa = explode(',', repempt($ustrs));
$dbs = m('knowtrais');
$mrs = m('knowtraim')->getone($id);
$ids = '0';
@@ -225,9 +225,9 @@ class mode_knowtraimClassAction extends inputAction{
$tkids = $ors['tkids'];
$dyids = $ors['dyids'];
$dyidsa= explode(',', $dyids);
$tkidsa= explode(',', $tkids);
$dyjgsa= explode(',', $ors['dyjgs']);
$dyidsa= explode(',', repempt($dyids));
$tkidsa= explode(',', repempt($tkids));
$dyjgsa= explode(',', repempt($ors['dyjgs']));
$danva = $jgarr = array();
$zfenshu = floatval($mrs['zfenshu']); //总分

32
webmain/install/rockxinhu.sql
View File

@@ -10,7 +10,7 @@ Target Server Type : MYSQL
Target Server Version : 50610
File Encoding : 65001
Date: 2024-07-31 12:52:18
Date: 2024-08-01 12:18:30
*/
SET FOREIGN_KEY_CHECKS=0;
@@ -71,7 +71,7 @@ CREATE TABLE `xinhu_admin` (
-- ----------------------------
-- Records of xinhu_admin
-- ----------------------------
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 ('1', 'A001', 'admin', '管理员', 'e10adc3949ba59abbe56e057f20f883e', '5904', '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', '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');
@@ -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-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');
INSERT INTO `xinhu_chargems` VALUES ('1', '0', '1', '2016-12-28 15:24:19', '2024-08-01 12:18:20', null, '1');
INSERT INTO `xinhu_chargems` VALUES ('2', '1', '1', '2016-12-28 15:21:14', '2024-08-01 12:18:20', null, '0');
-- ----------------------------
-- Table structure for `xinhu_city`
@@ -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=4941 DEFAULT CHARSET=utf8 COMMENT='单据操作记录';
) ENGINE=MyISAM AUTO_INCREMENT=4943 DEFAULT CHARSET=utf8 COMMENT='单据操作记录';
-- ----------------------------
-- Records of xinhu_flow_log
@@ -5407,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-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');
INSERT INTO `xinhu_im_history` VALUES ('1', 'group', '2', '2', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
INSERT INTO `xinhu_im_history` VALUES ('2', 'group', '2', '7', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
INSERT INTO `xinhu_im_history` VALUES ('3', 'group', '2', '6', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
INSERT INTO `xinhu_im_history` VALUES ('4', 'group', '2', '8', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
INSERT INTO `xinhu_im_history` VALUES ('5', 'group', '2', '5', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
INSERT INTO `xinhu_im_history` VALUES ('6', 'group', '2', '1', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
INSERT INTO `xinhu_im_history` VALUES ('7', 'group', '2', '4', '8', '2024-08-01 12:14:55', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '1', null, null, '0');
-- ----------------------------
-- Table structure for `xinhu_im_menu`
@@ -5665,7 +5665,7 @@ CREATE TABLE `xinhu_im_mess` (
-- ----------------------------
-- Records of xinhu_im_mess
-- ----------------------------
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);
INSERT INTO `xinhu_im_mess` VALUES ('1', '2024-08-01 12:14:55', '1', '5aSn5a625pyJ5ZWl6Zeu6aKY6L!Z6YeM6K!05ZWK77yB', '8', '2', '2,7,6,8,5,1,4', 'group', null, '0', null);
-- ----------------------------
-- Table structure for `xinhu_im_messzt`
@@ -5745,7 +5745,7 @@ CREATE TABLE `xinhu_infor` (
-- ----------------------------
INSERT INTO `xinhu_infor` VALUES ('1', '欢迎使用信呼工作台', '2018-04-26 17:27:10', '通知公告', '<p>\n 欢迎使用，有任何问题可以随时联系我们，帮你解答哦。&nbsp;\n</p>\n<p>\n 信呼是一款开源免费的工作台软件，可添加应用，管理，pc上，app都可以使用，我们的代码全部开放，可自由使用。\n</p>', 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', '规则制度', '<p>\n 1、每个人工作日在下班后必须写工作日报，全天请假可不用写，只要有上班就需要写，即使你上班1分钟。\n</p>\n<p>\n 2、也可以隔天写。\n</p>\n<p>\n <strong>未写处罚</strong> \n</p>\n<p>\n 1、未写一次扣五块，累计加倍。\n</p>', 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.4版本', '2024-07-31 12:27:30', '通知公告', '<p>\n 版本添加了发布如下功能啊。\n</p>\n<p>\n 1、系统功能完善。\n</p>\n<p>\n 2、更新了很多，自己看<a href=\"http://www.rockoa.com/view_core.html\" target=\"_blank\">升级日志</a>。\n</p>', '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 ('6', '信呼更新发布V2.6.5版本(必看)', '2024-08-01 12:11:08', '通知公告', '<p>\n 版本添加了发布如下功能啊。\n</p>\n<p>\n 1、系统功能完善。\n</p>\n<p>\n 2、更新了很多，自己看<a href=\"http://www.rockoa.com/view_core.html\" target=\"_blank\">升级日志</a>。\n</p>\n<p>\n 3、系统默认有测试数据，可到：系统→系统工具→初始化备份，下初始化删除测试数据。\n</p>', 'http://www.rockoa.com/view_down.html', 'd1', '信呼开发团队', '1', '管理员', null, null, '信呼开发团队', '2024-08-01', '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');
-- ----------------------------
@@ -6920,7 +6920,7 @@ CREATE TABLE `xinhu_option` (
PRIMARY KEY (`id`),
KEY `num` (`num`),
KEY `pid` (`pid`)
) ENGINE=MyISAM AUTO_INCREMENT=922 DEFAULT CHARSET=utf8 COMMENT='系统选项';
) ENGINE=MyISAM AUTO_INCREMENT=921 DEFAULT CHARSET=utf8 COMMENT='系统选项';
-- ----------------------------
-- Records of xinhu_option
@@ -7964,7 +7964,7 @@ CREATE TABLE `xinhu_task` (
INSERT INTO `xinhu_task` VALUES ('1', '流程从新匹配', '系统', 'flow,pipei', 'd,d', '00:10:00,12:10:00', '每天0,12点', '1', '0', null, null, '0', null, null, null, null, null);
INSERT INTO `xinhu_task` VALUES ('2', '数据备份', '系统', 'sys,beifen', 'd', '00:20:00', '每天凌晨00:20', '1', '0', null, null, '0', null, null, null, null, null);
INSERT INTO `xinhu_task` VALUES ('3', '系统升级提醒', '系统', 'sys,upgtx', 'd', '00:25:00', '每天凌晨00:25', '0', '0', null, null, '0', null, null, null, '1,8', '管理员,信呼客服');
INSERT INTO `xinhu_task` VALUES ('4', '5分钟运行1次', '系统', 'minute5,run', 'i5', '00', '每5分钟运行一次', '1', '0', null, null, '0', null, null, '这个是必须的，不可删除停用', null, null);
INSERT INTO `xinhu_task` VALUES ('4', '5分钟运行1次', '系统', 'minute5,run', 'i5', '00', '每5分钟运行一次', '1', '1', '2024-08-01 12:15:00', null, '0', null, 'success', '这个是必须的，不可删除停用', null, null);
INSERT INTO `xinhu_task` VALUES ('5', '考勤信息提醒', '考勤', 'kaoqin,todo', 'd', '09:25:00', '每天9点', '1', '0', null, null, '21', null, null, '在模块【考勤信息】下设置提醒到哪些平台。', null, null);
INSERT INTO `xinhu_task` VALUES ('6', '用户数据更新', '用户', 'sys,dataup', 'd', '00:10:00', '每天', '1', '0', null, null, '1', null, null, null, null, null);
INSERT INTO `xinhu_task` VALUES ('7', '考勤分析', '考勤', 'kaoqin,anay', 'd', '02:15:00', '每天2点', '1', '0', null, null, '22', null, null, '分析全体人员昨天的考勤', null, null);

2
webmain/main/flow/flowAction.php
View File

@@ -1,6 +1,8 @@
<?php
class flowClassAction extends Action
{
private $modeid,$moders,$isflow;
public function loaddataAjax()
{
$id = (int)$this->get('id');

1
webmain/model/adminModel.php
View File

@@ -401,6 +401,7 @@ class adminClassModel extends Model
public function getface($face, $mr='')
{
if($face==null)$face='';
if($mr=='')$mr = 'images/noface.png';
if(substr($face,0,4)!='http' && !$this->isempt($face))$face = URL.''.$face.'';
$face = $this->rock->repempt($face, $mr);

2
webmain/model/flow/flow.php
View File

File diff suppressed because one or more lines are too long

2
webmain/model/wxgzh/wxgzh.php
View File

@@ -24,6 +24,8 @@ class wxgzhModel extends Model
protected $secret = '';
public function initWxgzh(){}
public $option;
public function initModel()
{
$this->backarr = array('errcode'=>-1, 'msg'=>'sorry,error');

2
webmain/public/publicAction.php
View File

@@ -1,6 +1,8 @@
<?php
class publicClassAction extends ActionNot{
private $officedocx;
public function initAction()
{
$this->mweblogin(0, false);

2
webmain/system/dept/deptAction.php
View File

@@ -1,6 +1,8 @@
<?php
class deptClassAction extends Action
{
private $allid,$rows;
public function defaultAction()
{

2
webmain/system/option/optionAction.php
View File

@@ -1,6 +1,8 @@
<?php
class optionClassAction extends Action
{
private $pid;
public function getlistAjax()
{
$num = $this->request('num');

2
webmain/system/sms/smsAction.php
View File

@@ -1,6 +1,8 @@
<?php
class smsClassAction extends Action
{
private $smsobj;
public function initAction()
{
$this->smsobj = c('xinhuapi');

1
webmain/system/table/tableAction.php
View File

@@ -1,6 +1,7 @@
<?php
class tableClassAction extends Action
{
private $nowtablename;
public function initAction()
{
if($this->getsession('isadmin')!='1')backmsg('别乱来');