|
@@ -22,11 +22,10 @@ use DFAFilter;
|
|
|
use area_helper;
|
|
|
use Log;
|
|
|
use session;
|
|
|
-use session_helper;
|
|
|
use Base;
|
|
|
use UnloginException;
|
|
|
use Exception;
|
|
|
-use mobileControl;
|
|
|
+use merchantControl;
|
|
|
use errcode;
|
|
|
|
|
|
class MerchantServer extends BaseServer
|
|
@@ -100,10 +99,10 @@ class MerchantServer extends BaseServer
|
|
|
}
|
|
|
}
|
|
|
catch (UnloginException $ex) {
|
|
|
- mobileControl::outerr(errcode::ErrUnLogin,errcode::msg(errcode::ErrUnLogin),'','android');
|
|
|
+ merchantControl::outerr(errcode::ErrUnLogin,errcode::msg(errcode::ErrUnLogin));
|
|
|
}
|
|
|
catch (Exception $ex) {
|
|
|
- mobileControl::outerr($ex->getCode(),$ex->getMessage(),'','android');
|
|
|
+ merchantControl::outerr($ex->getCode(),$ex->getMessage());
|
|
|
Log::record("run_looper exception catch code={$ex->getCode()} msg={$ex->getMessage()} trace={$ex->getTraceAsString()}",Log::ERR);
|
|
|
}
|
|
|
session::instance()->end();
|