diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php index ee5f88c7..afc1249f 100644 --- a/f_install/j_setup_db.php +++ b/f_install/j_setup_db.php @@ -12,6 +12,10 @@ $servHost = Util::getReq('serv_host'); $sharedIconPath = Util::getReq('shared_icon_path'); $gameImagePath = Util::getReq('game_image_path'); +$kakaoRESTKey = Util::getReq('kakao_rest_key', 'string', ''); +$kakaoAdminKey = Util::getReq('kakao_admin_key', 'string', ''); + + if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) { Json::die([ 'result'=>false, @@ -263,10 +267,15 @@ $result = Util::generateFileUsingSimpleTemplate( ] ); +$kakaoRedirectURI = WebUtil::resolveRelativePath('oauth_kakao/oauth.php', $servHost); + Util::generateFileUsingSimpleTemplate( __dir__.'/templates/KakaoKey.orig.php', ROOT.'/d_setting/KakaoKey.php', [ + 'REST_API_KEY'=>$kakaoRESTKey, + 'ADMIN_KEY'=>$kakaoAdminKey, + 'REDIRECT_URI'=>$kakaoRedirectURI ], true ); @@ -280,5 +289,6 @@ if ($result !== true) { Json::die([ 'result'=>true, - 'reason'=>'success' + 'reason'=>'success', + 'globalSalt'=>$globalSalt ]); diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php index 4c842c8b..358df58d 100644 --- a/i_entrance/j_server_get_admin_status.php +++ b/i_entrance/j_server_get_admin_status.php @@ -76,7 +76,7 @@ foreach (AppConf::getList() as $setting) { 'korName' => $serverKorName, 'color' => $serverColor, 'isRoot' => $serverDir == $rootServer, - 'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/master' + 'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/devel' ]; $server[] = $state; }