From 71b03499cfaea91449b3a523987dfdc18a61e1da Mon Sep 17 00:00:00 2001
From: metallurgical <norlihazmey89@gmail.com>
Date: Sat, 4 Feb 2017 04:07:59 +0800
Subject: [PATCH] add fence & multicurl library

---
 .../ServiceProvider/ArchServiceProvider.php         | 13 ++++++++++---
 src/Repositories/Tools/Libraries/Encryption.php     |  8 ++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Repositories/ServiceProvider/ArchServiceProvider.php b/src/Repositories/ServiceProvider/ArchServiceProvider.php
index 210e882..222e4b0 100644
--- a/src/Repositories/ServiceProvider/ArchServiceProvider.php
+++ b/src/Repositories/ServiceProvider/ArchServiceProvider.php
@@ -1,8 +1,12 @@
 <?php
 
 namespace Arch\Repositories\ServiceProvider;
+
+use Arch\Repositories\Tools\Libraries\Encryption;
+use Arch\Repositories\Tools\Libraries\MultiCurl;
 use Illuminate\Support\ServiceProvider;
 
+
 class ArchServiceProvider extends ServiceProvider
 {
     private $commandPath = 'command.arch.';
@@ -30,12 +34,15 @@ public function register()
         /*
          * Register the service provider for the dependency.
          */
-        $this->app->register( 'Arch\Repositories\ServiceProvider\ArchServiceProvider' );
+        //$this->app->register( 'Arch\Repositories\ServiceProvider\ArchServiceProvider' );
         /*
          * Create aliases for the dependency.
          */
-        $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-        $loader->alias( 'Fence', 'Arch\Repositories\Tools\Libraries\Encryption' );
+        $this->app->booting(function() {
+            $loader = \Illuminate\Foundation\AliasLoader::getInstance();
+            $loader->alias( 'Arch\Libs\Fence', Encryption::class );
+            $loader->alias( 'Arch\Libs\MultiCurl', MultiCurl::class );
+        });
         
     }
     /**
diff --git a/src/Repositories/Tools/Libraries/Encryption.php b/src/Repositories/Tools/Libraries/Encryption.php
index a8850c5..a202d2f 100644
--- a/src/Repositories/Tools/Libraries/Encryption.php
+++ b/src/Repositories/Tools/Libraries/Encryption.php
@@ -66,7 +66,7 @@ public static function encode ( $toEncode ) {
 		try {
 
 			$hash = new Hashids( self::$salt, 15 );
-			$encodedVal = $hashids->encode( $toEncode );
+			$encodedVal = $hash->encode( $toEncode );
 			return $encodedVal;
 
 		}
@@ -83,9 +83,9 @@ public static function decode ( $toDecode ) {
 
 		try {
 
-			$hash = new Hashids( self::$salt );
-			$decodedVal = $hashids->decode( $toDecode );
-			return $decodedVal;
+			$hash = new Hashids( self::$salt, 15 );
+			$decodedVal = $hash->decode( $toDecode );
+			return $decodedVal[0];
 
 		}
 		catch ( Exception $e ) {