diff --git a/application/admin/lang/zh-cn/auth/api/key.php b/application/admin/lang/zh-cn/auth/api/key.php index bed635b..0a29b04 100644 --- a/application/admin/lang/zh-cn/auth/api/key.php +++ b/application/admin/lang/zh-cn/auth/api/key.php @@ -1,6 +1,7 @@ '用户描述', 'Key' => '分配的key', 'Public_key' => '对方调用公钥' ]; diff --git a/application/admin/view/auth/api/key/add.html b/application/admin/view/auth/api/key/add.html index 8184de4..f940a7a 100644 --- a/application/admin/view/auth/api/key/add.html +++ b/application/admin/view/auth/api/key/add.html @@ -1,5 +1,11 @@
+
+ +
+ +
+
@@ -9,7 +15,7 @@
- +
diff --git a/application/admin/view/auth/api/key/edit.html b/application/admin/view/auth/api/key/edit.html index 2e47a7c..dc71544 100644 --- a/application/admin/view/auth/api/key/edit.html +++ b/application/admin/view/auth/api/key/edit.html @@ -1,5 +1,11 @@ +
+ +
+ +
+
@@ -9,7 +15,7 @@
- +
diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 169c9fa..4567b57 100644 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -102,6 +102,8 @@ class Index extends Api "unpaid_activity_cancel_time"=> config("site.unpaid_activity_cancel_time"), "unpaid_activity_expire_time"=> config("site.unpaid_activity_expire_time"), "miniapp_activity_swtich"=> config("site.miniapp_activity_swtich"), + + "classes_wx_miniapp_id"=>config('site.classes_wx_miniapp_id'), ]; $customer_service = [ "image"=>cdnurl(config('site.customer_service_image'),true), diff --git a/application/api/controller/User.php b/application/api/controller/User.php index d0f47d3..737d13e 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -6,6 +6,7 @@ use addons\xilufitness\services\login\LoginService; use app\common\controller\Api; use app\common\library\Ems; use app\common\library\Sms; +use app\common\model\auth\api\Key; use app\common\model\dyqc\ManystoreShop; use app\common\model\manystore\UserAuth; use app\common\model\school\activity\Activity; @@ -23,7 +24,7 @@ use app\admin\library\Wechat; */ class User extends Api { - protected $noNeedLogin = ["registerLogin","getTtOpenid","decodeTtData",'getOpenid','decodeData','login', 'mobilelogin', 'register', 'resetpwd', 'changeemail', 'changemobile', 'third']; + protected $noNeedLogin = ["auto_login_token","registerLogin","getTtOpenid","decodeTtData",'getOpenid','decodeData','login', 'mobilelogin', 'register', 'resetpwd', 'changeemail', 'changemobile', 'third']; protected $noNeedRight = '*'; protected $miniConfig; @@ -322,7 +323,7 @@ class User extends Api public function index() { - $data = [ + $data = [ 'welcome' => $this->auth->nickname, 'user_info'=>$this->auth->getUserinfo() ]; @@ -683,6 +684,57 @@ class User extends Api + /** + * 获取跳转小程序自动登录传参 + * @ApiParams (name="encryption", type="string", required=false, description="是否公钥加密 1是，0否, 默认 是") + */ + public function auto_login_token() + { + $encryption = $this->request->param("encryption/d", 1); + $key = $this->request->param("key/s", "hschool"); + // token + $token = $this->login_token; + //接入大模型 + $public_key = Key::where("key",$key)->value("public_key"); + if(!$public_key) return $this->error("非法请求"); + $encrypted = null; + if($token){ + //已登录 + //公钥加密 +// echo "=== 公钥加密，私钥解密 ===\n"; + $encryption_data = [ + "token"=>$token, + "time"=>time(), + "encryption_data"=>null, + ]; + //生成json 数据 格式不变 + $url_data = json_encode($encryption_data); + $encrypted = ''; + if (!openssl_public_encrypt($url_data, $encrypted, $public_key)) { + $this->error("公钥加密失败: " . openssl_error_string()); + } +// echo "加密后的数据（Base64）: " . base64_encode($encrypted) . "\n"; + + } + + if($encryption){ + $data =[ + "token"=>null, + "time"=>null, + "encryption_data"=> base64_encode($encrypted), //编码用于传输 + + ]; + }else{ + $data =$encryption_data; + } + + + + $this->success('获取成功',$data); + } + + + diff --git a/application/api/controller/openapi/Base.php b/application/api/controller/openapi/Base.php new file mode 100644 index 0000000..523c5dc --- /dev/null +++ b/application/api/controller/openapi/Base.php @@ -0,0 +1,76 @@ +checkToken(); + + + + } + public function checkToken() + { + // token + $key = $this->request->param('key/s',""); + $encryption_data = $this->request->param('encryption_data/s',""); + $sign = $this->request->param('sign/s',""); + if (!$encryption_data) { + $this->error('异常的调用'); + } + //根据key查询公钥库 + $public_key = \app\common\model\auth\api\Key::where('key', $key)->value("public_key"); + if (!$public_key) { + $this->error('非法访问！'); + } + $decrypted = ''; + if (!openssl_public_decrypt(base64_decode($sign), $decrypted, $public_key)) { + $this->error('非法访问！'); + } + $sign_data = json_decode($decrypted, true); + //取出时间戳 + $timestamp = $sign_data['timestamp']; + //授权有效时间只有3分钟 + if (time() - $timestamp > 180) { + $this->error('授权已过期'); + } + //公钥解密加密数据 + if($encryption_data){ + $decrypt_data = ''; + if (!openssl_public_decrypt(base64_decode($encryption_data), $decrypt_data, $public_key)) { + $this->error('非法访问！'); + } + $this->decrypt_data = json_decode($decrypt_data, true); + + //如果有当前服务器的token，塞入当前服务，重新加载父类_initialize方法 + if(!empty($this->decrypt_data['token'])){ + $token = $this->decrypt_data['token']; + $this->auth->init($token); + } + + } + + + + } + + + +} \ No newline at end of file diff --git a/application/api/controller/openapi/User.php b/application/api/controller/openapi/User.php new file mode 100644 index 0000000..eb10c4a --- /dev/null +++ b/application/api/controller/openapi/User.php @@ -0,0 +1,41 @@ +auth->getUser();//登录用户 + if($user)$user_id = $user['id']; + if(!$user_id) $this->error(__('请登录')); + + $this->success('请求成功',$user); + } + +} \ No newline at end of file diff --git a/application/api/controller/school/NewActivity.php b/application/api/controller/school/NewActivity.php index 9696ab1..3a3b19b 100644 --- a/application/api/controller/school/NewActivity.php +++ b/application/api/controller/school/NewActivity.php @@ -165,6 +165,7 @@ class NewActivity extends Base try{ //当前申请状态 $res = $this->model::getVaildList($params); + $count = $this->model::getVaildList($params,true); // if($user_id =='670153'){ // file_put_contents("ceshi66.txt",(new AppointmentOrder())->getLastSql()); // } @@ -172,7 +173,7 @@ class NewActivity extends Base $this->error($e->getMessage()); } - $this->success('查询成功', ["list"=>$res]); + $this->success('查询成功', ["list"=>$res,"count"=>$count]); } diff --git a/application/common/controller/Api.php b/application/common/controller/Api.php index e4b2b1b..41a3279 100644 --- a/application/common/controller/Api.php +++ b/application/common/controller/Api.php @@ -65,6 +65,9 @@ class Api */ protected $responseType = 'json'; + + protected $login_token = null; + /** * 构造方法 * @access public @@ -136,7 +139,7 @@ class Api // token $token = $this->request->server('HTTP_TOKEN', $this->request->request('token', \think\Cookie::get('token'))); - + $this->login_token = $token; $path = str_replace('.', '/', $controllername) . '/' . $actionname; // 设置当前请求的URI $this->auth->setRequestUri($path); diff --git a/application/common/model/auth/api/Key.php b/application/common/model/auth/api/Key.php new file mode 100644 index 0000000..67cf5c3 --- /dev/null +++ b/application/common/model/auth/api/Key.php @@ -0,0 +1,40 @@ +getWithAlisaName().'.'; $with = ['user']; @@ -930,6 +930,10 @@ class Activity extends BaseModel // throw new \Exception("现版本不支持"); $selfetch = $selfetch->having("distance <= {$nearby}"); } + if($count){ + $total = $selfetch->count(); + return $total; + } @@ -1300,7 +1304,7 @@ class Activity extends BaseModel if($trans){ self::rollbackTrans(); } - throw new \Exception($e->getMessage().$e->getFile().$e->getLine()); + throw new \Exception($e->getMessage()); } return $row; } diff --git a/public/assets/js/backend/auth/api/key.js b/public/assets/js/backend/auth/api/key.js index 82eee22..203ce99 100644 --- a/public/assets/js/backend/auth/api/key.js +++ b/public/assets/js/backend/auth/api/key.js @@ -28,7 +28,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'id', title: __('Id')}, {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'key', title: __('Key'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'public_key', title: __('Public_key'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ]