diff --git a/app/Http/Admin/Services/Setting.php b/app/Http/Admin/Services/Setting.php index 1c4b2b99..935dda54 100644 --- a/app/Http/Admin/Services/Setting.php +++ b/app/Http/Admin/Services/Setting.php @@ -61,8 +61,7 @@ class Setting extends Service { $oa = $this->getSettings('wechat.oa'); - $oa['auth_url'] = $oa['auth_url'] ?: kg_full_url(['for' => 'home.wechat.oa.auth_callback']); - $oa['notify_url'] = $oa['notify_url'] ?: kg_full_url(['for' => 'home.wechat.oa.notify_callback']); + $oa['notify_url'] = $oa['notify_url'] ?: kg_full_url(['for' => 'home.wechat.oa.notify']); return $oa; } diff --git a/app/Http/Admin/Views/setting/wechat_oa.volt b/app/Http/Admin/Views/setting/wechat_oa.volt index c430775b..a142d43c 100644 --- a/app/Http/Admin/Views/setting/wechat_oa.volt +++ b/app/Http/Admin/Views/setting/wechat_oa.volt @@ -1,6 +1,6 @@
- +
@@ -31,13 +31,7 @@
- -
- -
-
-
- +
diff --git a/db/migrations/20201205091213_create_connect_table.php b/db/migrations/20201205091213_create_connect_table.php index 53041625..460b2c8e 100644 --- a/db/migrations/20201205091213_create_connect_table.php +++ b/db/migrations/20201205091213_create_connect_table.php @@ -84,7 +84,7 @@ class CreateConnectTable extends Phinx\Migration\AbstractMigration 'after' => 'create_time', ]) ->addIndex(['open_id', 'provider'], [ - 'name' => 'openid_provider', + 'name' => 'open_id_provider', 'unique' => false, ]) ->create(); diff --git a/db/migrations/20201212102844_schema_202012121830.php b/db/migrations/20201212102844_schema_202012121830.php index 6622a6ec..46f991ea 100644 --- a/db/migrations/20201212102844_schema_202012121830.php +++ b/db/migrations/20201212102844_schema_202012121830.php @@ -79,6 +79,10 @@ class Schema202012121830 extends Phinx\Migration\AbstractMigration 'comment' => '更新时间', 'after' => 'create_time', ]) + ->addIndex(['union_id', 'provider'], [ + 'name' => 'union_id_provider', + 'unique' => false, + ]) ->addIndex(['user_id'], [ 'name' => 'user_id', 'unique' => false,