2 Komitmen a51dff04ee ... a62430f31b

Pembuat SHA1 Pesan Tanggal
  superbee315 a62430f31b Merge branch 'master' of https://git.dashgame.com/gsgundam/garden_server 5 tahun lalu
  superbee315 615bb9708f modify info 5 tahun lalu

+ 33 - 3
application/index/controller/Index.php

@@ -1,13 +1,43 @@
 <?php
 namespace app\index\controller;
 
-use app\base\controller\Base;
+use crypt\Rsa;
+use crypt\Des;
+use think\Controller;
 
-class Index extends Base
+class Index extends Controller
 {
     public function index()
     {
+    	$info = '{"info":"1231233221EJrJ6GMQ5dAd7ZNQJNSzjKfdlBz1gRBBUgLz3KbN7RVMhv7pYNGHn0QC6RaGy0lqcohWBIDZ50JJ10vUo0AU1TpzxrLIA6SR2kussAaag9uziG18aOHqdsMSzDHAVyTUpCVz6avuxLGkTeXuNlCilx0GQiRnIQYNEDZMLEuiUfcvZfAij3g2Rut55UCcYpRpJWNtgFicRGxur9NRVdbJk4hDXt5XeLvapWGIWoPjl6sOFnZFRt6QQzJwWaUtWlQLDUu41tibpBOQZ6sZJluEbLqCV4a1CbQDmM1uw69Sb4Jz3dFyiYSRQtoP6S4crycYV9raWU1cTw", "id":"1.0"}';
     	
-    	return $this->fetch();
+    	echo $tmp = Rsa::publicEncrypt($info);
+    	echo "<br>";
+    	echo "<br>";
+    	echo "<br>";
+    	
+    	echo Rsa::privDecrypt($tmp);
+    }
+    
+    public function encrypt()
+    {    	
+    	$short = $this->request->post('short');
+    	
+    	$short .= $time = time(); 
+    	
+    	$str = 'gHr6BvYb6Pxrg4l8AfR3j1JrQx3RxI3IbQZ+3T2cNylK5Iw/V6xPhNwJamsNIiZPk+cvpYKd67HGrCDz6LP1UijmaSVVRqfPxnJ5X/dlJ4TeeA8qWO8NdHRAWb6u5f1z7LZ4evNYRO+67nn3gZN9BFmvXLk0sgIcAdBs2VsRaNR3Ao7ra5knlGVib7k6LpfJOKtQdoeF7zqCf1uqgOuvJPkR6hl0u+uqGBe9mtw96ypWACcL2mafP0P5DtLc8zVYbud6i+7ANe1LMvlD0JcwaHkHIwR1EFcScI8uzgXtA3ZLf78I/OlGfFnkE2/7PrAdSssCjmPMuCO0a25hAyOi+Xi5Bz8ILCo3+XleUPzAS+cTSidPk1FR4DTIL8WpQfcxbRvjIyp4Z9uXbhhfmONXhnu09RHsvBiNFOYQX2v1l30tf250xfaRCpBHWXOEzwtBwp+C722JAWg3Rpt0P+aRGaRRnBrkCfam6i+q1FJBapN3y5sd7xn2kwAGg2mFXB0bCn7YTTGGuXsSj/sItaRSvlNRA3iTHRE8ETgfFytDEh+ci5f9qXrv2nqoN66TuWDnedKMixw7kLp6geazeyvbSjGOp78nskToixfFza2mcgHxx+rFg8IMJjf1//kDHZYZsMh8tu6gkXypRMGOsTi/yPwiAzC0+PS+xDPU4pDKV+xayrlL1l5eJleSb4HlOQ6JJU4Q1pF9E6LqnyDwDQGPbEVLgA2+MFQcuKHMvQJS60dM6awNQLcmDMOkD4hySdAnxcz7FN57f7ayw/EBOMaJtn2RQc0r5QbVdquFUJsvg3y+16HjCi3C5bp78kTWCkWA9PqNLIYkCfnD524JqpI5pSoURKxIHlDKkhlAjbjNm2X/W2khM3cwlQ18wV/rbzLXjfZaZgq/1dnZOOHniCQMvoS8w0M4yiuyO8JEW0TcRL5cM5bYn3V5PwqpGiyhTI0oHNCpu9AZHBxysL/tqzloZyaV4MFuZTV5JFizj5nER+4Kf5DRK566kFMwgq17hhRbgHO+yVkT4ugkfMYebyH+EXylrdRBzCvwoprrocQwPsQ0wsfa7FzWn05MPaL+mWUfmQzemuBYJ9j/y1m4cZnfTafJkzKOF9oPGeNcNseKMwllK2n5PbwVMkebD++nOwTERwRF9GZ4SJsY5psUIm6TQH6JPATphyd6oi6Nvnxlx9q6v9EtzZ0wxqB8FukGpu6fAt6gvzZdPeJFOe4XaOb68WeAuGjYA2rw8g4i9l6xKPVqRFrtOmYC7gZL7Yk36qmouTT1cM80TWKQkXvDT0WHy67z7cmQ2AIRlY4SdggdGdEwmam5uqcZHFAOypWYegzey+u4vIbxO7vWRMHM6sQfSw==';
+    	$tmp = Des::encrypt($str, $short);
+    	
+    	return json(['sign'=>$tmp, 'time'=>$time]);
+    }
+    
+    public function decrypt() {
+    	$sign = $this->request->post('sign');
+    	$time = $this->request->post('time');
+    	$short = $this->request->post('short');
+    	
+    	$tmp = Des::decrypt($sign, $key = $short.$time);
+    	
+    	return json(['sign'=>$tmp]);
     }
 }

+ 7 - 3
application/newhome/controller/Message.php

@@ -18,8 +18,10 @@ class Message extends Controller {
 	
 	public function read()
 	{
-		$uid = $this->request->post('u', '1907239071686061468');
-		$mid = $this->request->post('i', 5);
+		$data = decode($this->request->post());
+		
+		$uid = $data['u'];
+		$mid = $data['i'];
 		
 		$res = $this->readModel->where(['uid'=>$uid, 'mid'=>$mid])->find();
 		if (empty($res)) {
@@ -30,7 +32,9 @@ class Message extends Controller {
 	}
 	
 	public function mail(){
-		$uid = $this->request->post('u', '1907239071686061468');
+		$data = decode($this->request->post());
+		
+		$uid = $data['u'];
 		
 		// 找到用户的所有邮件
 		$res = $this->mailModel

+ 1 - 2
application/newhome/controller/Show.php

@@ -2,7 +2,6 @@
 namespace app\newhome\controller;
 
 use think\Controller;
-use app\user\model\UserSkill;
 use think\Db;
 
 class Show extends Controller {
@@ -47,7 +46,7 @@ class Show extends Controller {
             $res['error'] = $result ? 0 : 2;
             $res['info'] = $info;
         }
-		catch (Exception $e)
+		catch (\Exception $e)
         {
             $res['error'] = 3;
             $res['reason'] = $e;