diff --git a/app/model/Ad.php b/app/model/Ad.php index a585e90..31ee750 100644 --- a/app/model/Ad.php +++ b/app/model/Ad.php @@ -7,7 +7,7 @@ use think\Model; class Ad extends Model { // 设置当前模型对应的完整数据表名称 - protected $table = 'public.bps_google_ads_ad'; + protected $table = 'bps.bps_google_ads_ad'; // 设置主键 protected $pk = 'ad_id'; diff --git a/app/model/AdGroup.php b/app/model/AdGroup.php index 33bb2d7..572133c 100644 --- a/app/model/AdGroup.php +++ b/app/model/AdGroup.php @@ -7,7 +7,7 @@ use think\Model; class AdGroup extends Model { // 设置当前模型对应的完整数据表名称 - protected $table = 'public.bps_google_ads_ad_group'; + protected $table = 'bps.bps_google_ads_ad_group'; // 设置主键 protected $pk = 'ad_group_id'; diff --git a/app/model/Campaign.php b/app/model/Campaign.php index 695ad34..604ac4e 100644 --- a/app/model/Campaign.php +++ b/app/model/Campaign.php @@ -7,7 +7,7 @@ use think\Model; class Campaign extends Model { // 设置当前模型对应的完整数据表名称 - protected $table = 'public.bps_google_ads_campaign'; + protected $table = 'bps.bps_google_ads_campaign'; // 设置主键 protected $pk = 'campaign_id'; diff --git a/app/model/CampaignBudget.php b/app/model/CampaignBudget.php index b6c34b2..2604cab 100644 --- a/app/model/CampaignBudget.php +++ b/app/model/CampaignBudget.php @@ -7,7 +7,7 @@ use think\Model; class CampaignBudget extends Model { // 设置当前模型对应的完整数据表名称 - protected $table = 'public.bps_google_ads_budget'; + protected $table = 'bps.bps_google_ads_budget'; // 设置主键 protected $pk = 'budget_id'; diff --git a/app/model/DayData.php b/app/model/DayData.php index 3ca4396..5513dcc 100644 --- a/app/model/DayData.php +++ b/app/model/DayData.php @@ -7,7 +7,7 @@ use think\Model; class DayData extends Model { // 设置当前模型对应的完整数据表名称 - protected $table = 'public.bps_google_ad_day_data'; + protected $table = 'bps.bps_google_ad_day_data'; // 设置复合主键 protected $pk = ['ad_id', 'date']; diff --git a/app/service/GoogleAdsAccountService.php b/app/service/GoogleAdsAccountService.php index d82eaed..c99741f 100644 --- a/app/service/GoogleAdsAccountService.php +++ b/app/service/GoogleAdsAccountService.php @@ -318,7 +318,7 @@ class GoogleAdsAccountService // 使用 ThinkDb 进行联表查询 // $advertiserId = 'your-advertiser-id'; // 假设你已经获得了广告商ID - $user = ThinkDb::table('bps_third_user_advertiser as a') + $user = ThinkDb::table('bps.bps_third_user_advertiser as a') ->join('bps_third_user as u', 'a.doc_ = u.id', 'left') // 连接 bps_third_user 表 ->where('a.advertiser_id', $advertiserId) ->select('u.access_token') // 只选择 access_token 字段 diff --git a/app/service/GoogleAdsAdService.php b/app/service/GoogleAdsAdService.php index 5232d12..06ce060 100644 --- a/app/service/GoogleAdsAdService.php +++ b/app/service/GoogleAdsAdService.php @@ -72,7 +72,7 @@ class GoogleAdsAdService // 使用 ThinkDb 进行联表查询 // $advertiserId = 'your-advertiser-id'; // 假设你已经获得了广告商ID - $user = ThinkDb::table('bps_third_user_advertiser as a') + $user = ThinkDb::table('bps.bps_third_user_advertiser as a') ->join('bps_third_user as u', 'a.doc_ = u.id', 'left') // 连接 bps_third_user 表 ->where('a.advertiser_id', $advertiserId) ->select('u.access_token') // 只选择 access_token 字段 diff --git a/app/service/GoogleAdsCampaignService.php b/app/service/GoogleAdsCampaignService.php index 73b117a..75aa98e 100644 --- a/app/service/GoogleAdsCampaignService.php +++ b/app/service/GoogleAdsCampaignService.php @@ -71,7 +71,7 @@ class GoogleAdsCampaignService // 使用 ThinkDb 进行联表查询 // $advertiserId = 'your-advertiser-id'; // 假设你已经获得了广告商ID - $user = ThinkDb::table('bps_third_user_advertiser as a') + $user = ThinkDb::table('bps.bps_third_user_advertiser as a') ->join('bps_third_user as u', 'a.doc_ = u.id', 'left') // 连接 bps_third_user 表 ->where('a.advertiser_id', $advertiserId) ->select('u.access_token') // 只选择 access_token 字段 @@ -402,11 +402,11 @@ class GoogleAdsCampaignService // dump($campaignsResourceName); foreach ($dayResourceName as $data) { -// $sql = "INSERT INTO public.bps_google_ad_day_data (ad_id, customer_id, ad_name, ad_resource_name, ad_group_id, campaign_id, clicks, cost_micros, conversions, conversions_value, impressions, date) +// $sql = "INSERT INTO bps.bps_google_ad_day_data (ad_id, customer_id, ad_name, ad_resource_name, ad_group_id, campaign_id, clicks, cost_micros, conversions, conversions_value, impressions, date) // VALUES (:ad_id, :customer_id, :ad_name, :ad_resource_name, :ad_group_id, :campaign_id, :clicks, :cost_micros, :conversions, :conversions_value, :impressions, :date)"; // ThinkDb::execute($sql, $data); - $sql = "INSERT INTO public.bps_google_ad_day_data + $sql = "INSERT INTO bps.bps_google_ad_day_data (ad_id, customer_id, ad_name, ad_resource_name, ad_group_id, campaign_id, clicks, cost_micros, conversions, conversions_value, impressions, date) VALUES (:ad_id, :customer_id, :ad_name, :ad_resource_name, :ad_group_id, :campaign_id, :clicks, :cost_micros, :conversions, :conversions_value, :impressions, :date) ON CONFLICT (ad_id, date) -- 假设 (ad_id, date) 为唯一约束 diff --git a/app/service/GoogleAdsGroupService.php b/app/service/GoogleAdsGroupService.php index 67726c9..0b337ec 100644 --- a/app/service/GoogleAdsGroupService.php +++ b/app/service/GoogleAdsGroupService.php @@ -59,7 +59,7 @@ class GoogleAdsGroupService // 使用 ThinkDb 进行联表查询 // $advertiserId = 'your-advertiser-id'; // 假设你已经获得了广告商ID - $user = ThinkDb::table('bps_third_user_advertiser as a') + $user = ThinkDb::table('bps.bps_third_user_advertiser as a') ->join('bps_third_user as u', 'a.doc_ = u.id', 'left') // 连接 bps_third_user 表 ->where('a.advertiser_id', $advertiserId) ->select('u.access_token') // 只选择 access_token 字段 diff --git a/app/service/GoogleOAuthService.php b/app/service/GoogleOAuthService.php index 560d0aa..84a0058 100644 --- a/app/service/GoogleOAuthService.php +++ b/app/service/GoogleOAuthService.php @@ -60,7 +60,7 @@ class GoogleOAuthService 'third_type' => 'google', ]; $tableName = 'bps_third_user'; - $tableName = getenv('DB_PG_SCHEMA') ? getenv('DB_PG_SCHEMA') . '.' . $tableName : 'public' . $tableName; + $tableName = getenv('DB_PG_SCHEMA') ? getenv('DB_PG_SCHEMA') . '.' . $tableName : 'bps' . $tableName; $sql = " INSERT INTO {$tableName}