ad

app/admin/controller/Cloud.php

@@ -54,7 +54,7 @@ public function create(){
 //        return error_show(1002,"参数is_edit不能为空");
 //    }
 
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show(1002,"申请人数据不存在");
     }
@@ -118,7 +118,7 @@ public function list(){
     $total = ceil($count/$size);
     $page = $page>$total ? $total:$page;
     $list = Db::name('talk')->where($where)->page($page,$size)->order("addtime desc")->select();
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
    // var_dump($apply_id);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show(1002,"申请人数据不存在");
@@ -150,7 +150,7 @@ public function edit(){
     if($talk_note==""){
         return error_show(1002,"参数talk_note不能为空");
     }
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show(1002,"申请人数据不存在");
     }

app/admin/controller/Deal.php

@@ -20,7 +20,7 @@ public function create(){
     if($bugNo==""){
         return error_show(1002,"参数bugNo不能为空");
     }
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show(1002,"申请人数据不存在");
     }

app/admin/controller/Note.php

@@ -42,7 +42,7 @@ public function create(){
 //        return error_show(1002,"参数talk不能为空");
 //    }
     $bugNo= makeNo("BG");
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show($apply_id['code'],$apply_id['message']);
     }
@@ -122,7 +122,7 @@ public function list(){
     if($apply_name!==""){
         $where[]=['apply_name',"like","%$apply_name%"];
     }
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show($apply_id['code'],$apply_id['message']);
     }
@@ -250,7 +250,7 @@ public function edit(){
     //array_column($in,"id");
     $tem['model_id']=$info['model_id'];
 
-    $apply_id =GetUserInfo($token);
+    $apply_id =verifyToken($token);
     if(empty($apply_id)||$apply_id['code']!=0){
         return error_show($apply_id['code'],$apply_id['message']);
     }

app/admin/controller/Role.php

@@ -70,14 +70,9 @@ class Role extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
-        $creater= GetUserInfo($post['token']);
-        if(isset($creater['code'])&&$creater['code']==0){
-            $uid= isset($userinfo['data']['id']) ? $userinfo['data']['id']: "0";
-            $username = isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname']: "";
-        }else{
-            $username = '';
-            $uid= 0;
-        }
+         $uid= isset($effetc['data']['id']) ? $effetc['data']['id']: "0";
+        $username = isset($effetc['data']['nickname']) ? $effetc['data']['nickname']: "";
+
         $rolename = isset($post['role_name']) ? trim($post['role_name']) : "";
         if($rolename==""){
             return error_show(1002,"角色名称不能为空");

app/admin/controller/User.php

@@ -37,8 +37,6 @@ class User extends BaseController
             'updatetime'=>date('Y-m-d H:i:s'),
         ];
         $insert = Db::name('user_role')->insert($data);
-//        $st = ["order_code"=>$uid,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-//        ActionLog::logAdd($token,$st,"resign_info",1,$st);
         return $insert? app_show(0,'数据新建成功'):error_show(1004,'数据新建失败');
     }
 
@@ -106,11 +104,11 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return app_show($effetc['code'],$effetc['message']);
         }
-        $userinfo=GetUserInfo($token);
-        if(empty($userinfo)||$userinfo['code']!=0){
-            return app_show(1002,"员工信息不存在");
-        }
-        $data = $userinfo['data'];
+//        $userinfo=GetUserInfo($token);
+//        if(empty($userinfo)||$userinfo['code']!=0){
+//            return app_show(1002,"员工信息不存在");
+//        }
+        $data = $effetc['data'];
         $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$data['id'])
             ->field("roleid,role_name,a.status")->find();
         $data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";

app/common.php

@@ -33,25 +33,46 @@ function randomkeys($length) {
 }
 //参数1：访问的URL，参数2：post数据(不填则为GET)，参数3：提交的$cookies,参数4：是否返回$cookies
 function curl_request($url,$post=''){
-    $curl = curl_init();
-    curl_setopt($curl, CURLOPT_URL, $url);
-    curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)');
-    curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-    curl_setopt($curl, CURLOPT_AUTOREFERER, 1);
-    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-    if($post) {
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
-    }
-    curl_setopt($curl, CURLOPT_TIMEOUT, 10);
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-    $data = curl_exec($curl);
-    if (curl_errno($curl)) {
-        return curl_error($curl);
-    }
-    curl_close($curl);
-    return $data;
+	$header = headerSign($post);
+	if(is_array($post)) $post=http_build_query($post);
+	$curl = curl_init();
+	curl_setopt($curl, CURLOPT_URL, $url);
+	curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)');
+	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+	curl_setopt($curl, CURLOPT_AUTOREFERER, 1);
+	curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+	if($post) {
+		curl_setopt($curl, CURLOPT_POST, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $post);
+	}
+	curl_setopt($curl, CURLOPT_TIMEOUT, 10);
+	curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
+	$data = curl_exec($curl);
+	if (curl_errno($curl)) {
+		return curl_error($curl);
+	}
+	curl_close($curl);
+	return $data;
+
+}
+
+if(!function_exists("headerSign")){
 
+	function headerSign($post){
+		$config = Config::get("sign");
+		$appid=$config['appid'];
+		$appkey=$config['appkey'];
+		$headerArr=["appid"=>'123',"noce"=>randomkeys(16),"sign"=>'',"timestamp"=>time()];
+		$value =array_merge($post,$headerArr);
+		$Sign= new \Sign($appid,$appkey);
+		$headerArr['sign'] = $Sign->makeSign($value);
+		$list=["Content-Type"=>"multipart/json;charset=utf-8"];
+		foreach ($headerArr as $key=>$value){
+			$list[]=$key.":".$value;
+		}
+		return $list;
+	}
 }
 /**
  * @param $token
@@ -62,7 +83,7 @@ function curl_request($url,$post=''){
  * @throws \think\exception\DbException
  */
 function VerifyTokens($token){
-    $url = env("user.hosturl")."verifyToken";
+    $url =env("user.hosturl")."verifyToken";
     $data=[
         "token"=>$token
     ];
@@ -76,9 +97,7 @@ function VerifyTokens($token){
  * @return mixed
  */
 function GetUserlist($token,$condition){
-    $host = Config::get("app");
-
-    $url = env("user.hosturl")."userlist";
+   $url = env("user.hosturl")."userlist";
     $condition['token']=$token;
     $response=curl_request($url,$condition);
 
@@ -91,8 +110,6 @@ function GetUserlist($token,$condition){
  * @return mixed
  */
 function GetAccountall($token, $condition){
-    $host = Config::get("app");
-
     $url = env("user.hosturl")."userall";
     $condition['token']=$token;
     $response=curl_request($url,$condition);
@@ -101,8 +118,6 @@ function GetAccountall($token, $condition){
 }
 
 function GetList($token,$condition){
-    $host = Config::get("app");
-
     $url = env("user.hosturl")."userlist";
     $condition['token']=$token;
     $response=curl_request($url,$condition);
@@ -110,13 +125,9 @@ function GetList($token,$condition){
     return json_decode($response,true);
 }
 
-function GetUserInfo($token){
-    $host = Config::get("app");
+function GetUserInfo($condition){
     $url = env("user.hosturl")."userinfo";
-    $data=[
-        "token"=>$token
-    ];
-    $response=curl_request($url,$data);
+    $response=curl_request($url,$condition);
 
     return json_decode($response,true);
 }
@@ -138,8 +149,6 @@ function checkMobile($mobile){
  * @return mixed
  */
 function resetinfo($token,$condition){
-    $host = Config::get("app");
-
     $url = env("user.hosturl")."usersave";
     $condition['token']=$token;
     $response=curl_request($url,$condition);
@@ -232,7 +241,6 @@ function made($var,$data=[]){
  * @return mixed
  */
 function GetInfoById($token,$condition){
-    $host = Config::get("app");
     $url = env("user.hosturl")."userinfo";
     $condition['token']=$token;
     $response=curl_request($url,$condition);

extend/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore