|
@@ -386,20 +386,21 @@ class Applet extends Base
|
|
private function getApplet()
|
|
private function getApplet()
|
|
{
|
|
{
|
|
$applet = Dever::config('base', 'project')->applet;
|
|
$applet = Dever::config('base', 'project')->applet;
|
|
|
|
+ $project = array();
|
|
if (Dever::project('token')) {
|
|
if (Dever::project('token')) {
|
|
$system = Dever::input('system', 1);
|
|
$system = Dever::input('system', 1);
|
|
$project = Dever::db('token/project')->one($system);
|
|
$project = Dever::db('token/project')->one($system);
|
|
|
|
+ }
|
|
|
|
|
|
- if (!$project) {
|
|
|
|
- if (isset($config['project']) && $config['project']) {
|
|
|
|
- $project = Dever::db($config['project'])->one($system);
|
|
|
|
- }
|
|
|
|
|
|
+ if (!$project) {
|
|
|
|
+ if (isset($applet['project']) && $applet['project']) {
|
|
|
|
+ $project = Dever::db($applet['project'])->one($system);
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
|
|
- if ($project) {
|
|
|
|
- $applet['appid'] = $project['appid'];
|
|
|
|
- $applet['secret'] = $project['secret'];
|
|
|
|
- }
|
|
|
|
|
|
+ if ($project) {
|
|
|
|
+ $applet['appid'] = $project['appid'];
|
|
|
|
+ $applet['secret'] = $project['secret'];
|
|
}
|
|
}
|
|
|
|
|
|
if (!$applet || !$applet['appid'] || !$applet['secret']) {
|
|
if (!$applet || !$applet['appid'] || !$applet['secret']) {
|