From 7adc5bb6b369a70fd0dd014eeb13f133e1c89c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Wed, 24 Sep 2025 09:58:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8D=A2=E6=88=BF=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20=E6=8B=8D=E5=8D=96=E4=BD=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 佛祖保佑.php | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 佛祖保佑.php diff --git a/佛祖保佑.php b/佛祖保佑.php new file mode 100644 index 0000000..2edd123 --- /dev/null +++ b/佛祖保佑.php @@ -0,0 +1,37 @@ +_/___.' >' "". + * | | : `- \`.;`\ _ /`;.`/ - ` : | | + * \ \ `_. \_ __\ /__ _/ .-` / / + *=====`-.____`.___ \_____/___.-`___.-'===== + * `=---=' + * + * 佛祖保佑 永无BUG + * 佛曰: + * 写字楼里写字间，写字间里程序员； + * 程序人员写程序，又拿程序换酒钱。 + * 酒醒只在网上坐，酒醉还来网下眠； + * 酒醉酒醒日复日，网上网下年复年。 + * 但愿老死电脑间，不愿鞠躬老板前； + * 奔驰宝马贵者趣，公交自行程序员。 + * 别人笑我忒疯癫，我笑自己命太贱； + * 不见满街漂亮妹，哪个归得程序员？ + */ +} \ No newline at end of file From 4a6e0f4e0fe3c861290940d66715beb30f02a7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Wed, 24 Sep 2025 10:53:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/UploadFile.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/adminapi/controller/UploadFile.php b/application/adminapi/controller/UploadFile.php index 0a18425..7020398 100644 --- a/application/adminapi/controller/UploadFile.php +++ b/application/adminapi/controller/UploadFile.php @@ -45,6 +45,9 @@ class UploadFile extends Upload $fileName = $pinyin->permalink($fileName, ''); // 转换为无分隔符的拼音 } + // 去除文件名中的空格 + $fileName = str_replace(' ', '', $fileName); + // 添加唯一标识符（时间戳+随机数） $uniqueId = time() . mt_rand(1000, 9999); $objectName = $fileName . '_' . $uniqueId . '.' . $extension; From 9f1ebf265782f06b6d721f1478ce170af3468339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Wed, 24 Sep 2025 15:15:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Room.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 5dc301c..48310de 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -530,10 +530,13 @@ class Room extends Model //进入房间 public function join_room($user_id, $room_id, $password) { - $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => 2])->find(); + $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => ['in',[1,2]]])->find(); if (!isset($room)) { return ['code' => 0, 'msg' => '房间不存在', 'data' => '']; } + if($room['apply_status'] == 1){ + return ['code' => 0, 'msg' => '房间正在审核中……', 'data' => '']; + } if(isset($room['password']) && $user_id != $room['user_id']){ if (empty($password) || $room['password'] != md5($password)) { return ['code' => 0, 'msg' => '密码错误', 'data' => '']; From 0cab20474506ef7cfcb578d0557f4ed7c29ab9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Wed, 24 Sep 2025 16:40:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=90=8E=E7=AB=AF=20=20=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/Room.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php index 37c5830..1088132 100644 --- a/application/adminapi/controller/Room.php +++ b/application/adminapi/controller/Room.php @@ -186,7 +186,7 @@ class Room extends adminApi $page = input('page', 1); $page_limit = input('page_limit', 30); $search_name = input('search_name', ''); - $where=[]; + $where['deletetime'] = 0; //标签名称 if($search_name!==''){ $where['label_name'] = ['like', '%'.$search_name.'%']; @@ -237,7 +237,7 @@ class Room extends adminApi if(!$type_data){ return V(0,"房间类型不存在"); } - $result = db::name($this->table_room_type)->where(['id'=>$type_id])->delete(); + $result = db::name($this->table_room_type)->where(['id'=>$type_id])->update(['deletetime'=>time()]); if(!$result){ return V(0,"删除失败"); } From b6c8ce98ee83a75e09ce8ec1e370bd5012f0cce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Wed, 24 Sep 2025 16:41:47 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=AD=85=E5=8A=9B=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Level.php | 87 +++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/application/api/model/Level.php b/application/api/model/Level.php index 01e604a..7aa889a 100644 --- a/application/api/model/Level.php +++ b/application/api/model/Level.php @@ -27,6 +27,7 @@ class Level extends Model { //规则 $return['rule_url'] = get_system_config_value('web_site')."/api/Page/page_show?id=10"; + $return['coin_charm_exp'] = get_system_config_value('coin_charm_exp'); //用户信息 $user = model('User')->get_user_info($uid); //用户头像 @@ -53,7 +54,7 @@ class Level extends Model //距离下个等级需要的经验 $return['user']['next_level'] = $user['charm_level']+1; $return['user']['next_level_str'] = 'Lv.'.$return['user']['next_level']; - $next_exp = $user_level['next_level_exp'] - $user['wealth_exp']; + $next_exp = $user_level['next_level_exp'] - $user['charm_exp']; $return['user']['next_exp'] = $next_exp <= 0 ? 0 : $next_exp; $return['user']['next_rights_icon'] = $user_level['next_rights_icon']; } @@ -90,7 +91,7 @@ class Level extends Model $return['level'][$key]['name'] = $value['name']; $return['level'][$key]['change_value'] = $value['change_value']; //当前用户距离当前段位的距离 - $return['level'][$key]['distance'] = $value['change_value'] - $user['wealth_exp']; + $return['level'][$key]['distance'] = $value['change_value'] - $user['charm_exp']; $return['level'][$key]['rights_icon'] = $value['rights_icon']; } } @@ -108,6 +109,7 @@ class Level extends Model { //规则 $return['rule_url'] = get_system_config_value('web_site')."/api/Page/page_show?id=11"; + $return['coin_wealth_exp'] = get_system_config_value('coin_wealth_exp'); //用户信息 $user = model('User')->get_user_info($uid); //用户头像 @@ -228,11 +230,11 @@ class Level extends Model $return['next_level_icon'] = $next_level_data['image']; $return['next_coins'] = $next_level_data['coins']; }else{ - $return['next_level'] = 0; - $return['next_level_name'] = ''; - $return['next_level_exp'] = 0; - $return['next_level_icon'] = ''; - $return['next_coins'] = 0; + $return['next_level'] = $level_data['level']; + $return['next_level_name'] = $level_data['name']; + $return['next_level_exp'] = $level_data['change_value']; + $return['next_level_icon'] = $level_data['image']; + $return['next_coins'] = $level_data['coins']; } return $return; } @@ -266,11 +268,11 @@ class Level extends Model $return['next_level_icon'] = $next_level_data['image']; $return['next_rights_icon'] = $next_level_data['rights_icon']; }else{ - $return['next_level'] = 0; - $return['next_level_name'] = ''; - $return['next_level_exp'] = 0; - $return['next_level_icon'] = ''; - $return['next_rights_icon'] = ""; + $return['next_level'] = $level_data['level']; + $return['next_level_name'] = $level_data['name']; + $return['next_level_exp'] = $level_data['change_value']; + $return['next_level_icon'] = $level_data['image']; + $return['next_rights_icon'] = $level_data['rights_icon']; } return $return; } @@ -291,10 +293,11 @@ class Level extends Model $user_wealth_level = $user['wealth_level']; $user_wealth_exp = $user['wealth_exp'] + $wealth_exp; //判断是否达到下一级别 - $user_wealth = $this->get_wealth_level_to_level($user_wealth_level); - if($user_wealth_exp>= $user_wealth['next_level_exp']){ - $user_wealth_level= $user_wealth['next_level']; - } + $user_wealth = $this->get_wealth_level_to_level_vlue($user_wealth_exp); +// if($user_wealth_level>= $user_wealth['level']){ +// $user_wealth_level= $user_wealth['level']; +// } + $user_wealth_level= $user_wealth['level']; $update_data = []; $update_data['wealth_level'] = $user_wealth_level; $update_data['wealth_exp'] = $user_wealth_exp; @@ -302,7 +305,7 @@ class Level extends Model $return = db('user_data')->where('user_id',$uid)->update($update_data); if($return){ //发放特权礼物 - if($user_wealth_exp>= $user_wealth['next_level_exp']){ + if($user_wealth_exp>= $user_wealth['exp']){ $wealth_level_rights = db('vs_wealth_level_rights')->where('level_id',$user_wealth_level)->find(); if(isset($wealth_level_rights['type']) && $wealth_level_rights['type'] ==1 ){//发座驾礼物 $log_remark = "财富等级达到".$user_wealth_level."级 发放座驾礼物"; @@ -321,10 +324,11 @@ class Level extends Model $user_charm_level = $user['charm_level']; $user_charm_exp = $user['charm_exp'] + $charm_exp; //判断是否达到下一级别 - $user_charm = $this->get_charm_level_to_level($user_charm_level); - if($user_charm_exp>= $user_charm['next_level_exp']){ - $user_charm_level= $user_charm['next_level']; - } + $user_charm = $this->get_charm_level_to_level_vlue($user_charm_exp); +// if($user_charm_level != $user_charm['level']){ +// $user_charm_level = $user_charm['level']; +// } + $user_charm_level = $user_charm['level']; $update_data = []; $update_data['charm_level'] = $user_charm_level; $update_data['charm_exp'] = $user_charm_exp; @@ -414,4 +418,45 @@ class Level extends Model } return ['code' => 1, 'msg' => "成功", 'data' => null]; } + + /* + * 通过魅力值获取对应等级 + */ + public function get_charm_level_to_level_vlue($charm_level){ + $return = []; + $level_data = Db::name('vs_charm_level')->where(["change_value"=>['<',$charm_level]])->order('change_value','desc')->find(); + if($level_data){ + $return['level'] = $level_data['level']; + $return['level_name'] = $level_data['name']; + $return['exp'] = $level_data['change_value']; + $return['level_icon'] = $level_data['image']; + }else{ + $return['level'] = 0; + $return['level_name'] = ''; + $return['exp'] = 0; + $return['level_icon'] = ''; + $return['rights_icon'] = ""; + } + return $return; + } + /* + * 通过财富值获取对应等级 + */ + public function get_wealth_level_to_level_vlue($wealth_level){ + $return = []; + $level_data = Db::name('vs_wealth_level')->where(["change_value"=>['<',$wealth_level]])->order('change_value','desc')->find(); + if($level_data){ + $return['level'] = $level_data['level']; + $return['level_name'] = $level_data['name']; + $return['exp'] = $level_data['change_value']; + $return['level_icon'] = $level_data['image']; + }else{ + $return['level'] = 0; + $return['level_name'] = ''; + $return['exp'] = 0; + $return['level_icon'] = ''; + $return['rights_icon'] = ""; + } + return $return; + } } From a3376691bfe9199e3f4689e86d45f0dad7dc8ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Wed, 24 Sep 2025 17:05:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B2=A1=E6=9C=89=E5=9C=A8=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E6=98=AF=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Room.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 48310de..eff8500 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -2524,7 +2524,10 @@ class Room extends Model if(!$room_id){ $room_id = Db::name('vs_room_visitor')->where('user_id', $user_id)->order('id desc')->value('room_id'); } - + $room = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->find(); + if($room){ + return ['code' => 1, 'msg' => '操作成功', 'data' => null]; + } $room_info = db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]); if(!$room_info){ return ['code' => 0, 'msg' => '加入房间失败', 'data' => null]; From 1b7f5d70b9ca39a024b99b17c0b85dd2ef01c17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Wed, 24 Sep 2025 17:17:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B3=A8=E9=94=80=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Login.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/application/api/model/Login.php b/application/api/model/Login.php index 019b0b2..61abe5a 100644 --- a/application/api/model/Login.php +++ b/application/api/model/Login.php @@ -428,6 +428,13 @@ class Login extends Model model('UserToken')->where('id', $user_info['id'])->update(['token' => 1]); $isstatus = model('User')->where('id', $user_info['user_id'])->update(['status' => 0]); if($isstatus){ + //查询用户所在房间 + $room_list = db::name('vs_room_visitor')->where('user_id', $user_info['user_id'])->select(); + if($room_list){ + foreach ($room_list as &$value) { + model('Room')->quit_room($user_info['user_id'], $value['room_id'],$user_info['user_id']); + } + } //删除用户 // model('Tencent')->account_delete($user_info['user_id']); model('User')->where('id', $user_info['user_id'])->update(['delete_time' => time()]); @@ -440,13 +447,7 @@ class Login extends Model db::name('vs_room')->where('id', $value['id'])->update(['room_status' => 3]); } } - //查询用户所在房间 - $room_list = db::name('vs_room_visitor')->where('user_id', $user_info['user_id'])->select(); - if($room_list){ - foreach ($room_list as &$value) { - model('Room')->quit_room($user_info['user_id'], $value['room_id'],$user_info['user_id']); - } - } + }else{ return ['code' => 0, 'msg' => '注销失败', 'data' => null]; } From f78ec648de5906a54c5dcb153422efb5f5e68ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Wed, 24 Sep 2025 18:21:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E9=AD=85=E5=8A=9B=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/Room.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php index 1088132..c9531c0 100644 --- a/application/adminapi/controller/Room.php +++ b/application/adminapi/controller/Room.php @@ -1268,6 +1268,7 @@ class Room extends adminApi //房间审核 public function room_audit(){ $id = input('id', ''); + $remark = input('remark', ''); if($id == ''){ return V(0,"参数错误"); } @@ -1294,6 +1295,9 @@ class Room extends adminApi }elseif($apply_status ==3){ $deal_content = '审核未通过'; } + if(!empty($remark)){ + $deal_content .= '，原因：'.$remark; + } db::name('system_message')->insert([ 'title' => '房间审核结果', 'content' => '您创建的房间'.$room_data['room_name'].$deal_content,