merge front code

app/Console/Commands/SendEmails.php

@@ -281,45 +281,39 @@ public function otherNoticeHandle($project, $activity)
         }
         else if ($activity['event_key'] == 'release_version')
         {
-            $release_versionid = isset($activity['data']['release_version']) ? $activity['data']['release_version'] : '';
-            if (!$release_versionid)
+            $release_version = isset($activity['data']) ? $activity['data'] : [];
+            if (!$release_version)
             {
                 return;
             }
 
-            $version = Version::find($release_versionid);
-            if (!$version) { return; }
-
             $released_issues = DB::collection('issue_' . $project->key)
-                ->where('resolve_version', $release_versionid)
+                ->where('resolve_version', $release_version['_id'])
                 ->where('resolution', '<>', 'Unresolved')
                 ->where('del_flg', '<>', 1)
                 ->get();
 
             $data = [
                 'project' => $project,
                 'released_issues' => $released_issues,
-                'resolve_version' => [ 'id' => $version->id, 'name' => $version->name ],
+                'resolve_version' => [ 'id' => $release_version['_id'], 'name' => $release_version['name'] ],
                 'user' => $activity['user'],
                 'http_host' => $this->http_host,
             ];
 
-            $subject = '[' . $this->mail_prefix . '] ' . $project->key . ':  版本-' . $version->name . ' 发布';
+            $subject = '[' . $this->mail_prefix . '] ' . $project->key . ':  版本-' . $release_version['name'] . ' 发布';
 
             $template = 'emails.version_release';
         }
         else if ($activity['event_key'] == 'create_release_version')
         {
             $released_issueids = isset($activity['data']['released_issues']) ? $activity['data']['released_issues'] : [];
-            $release_versionid = isset($activity['data']['release_version']) ? $activity['data']['release_version'] : '';
-            if (!$released_issueids || !$release_versionid)
+            $release_version = isset($activity['data']['release_version']) ? $activity['data']['release_version'] : [];
+            if (!$released_issueids || !$release_version)
             {
                 return;
             }
 
-            $version = Version::find($release_versionid);
-            if (!$version) { return; }
-
             $released_issues = DB::collection('issue_' . $project->key)
                 ->whereIn('_id', $released_issueids)
                 ->where('del_flg', '<>', 1)
@@ -328,12 +322,12 @@ public function otherNoticeHandle($project, $activity)
             $data = [
                 'project' => $project,
                 'released_issues' => $released_issues,
-                'resolve_version' => [ 'id' => $version->id, 'name' => $version->name ],
+                'resolve_version' => [ 'id' => $release_version['_id'], 'name' => $release_version['name'] ],
                 'user' => $activity['user'],
                 'http_host' => $this->http_host,
             ];
 
-            $subject = '[' . $this->mail_prefix . '] ' . $project->key . ':  版本-' . $version->name . ' 发布';
+            $subject = '[' . $this->mail_prefix . '] ' . $project->key . ':  版本-' . $release_version['name'] . ' 发布';
 
             $template = 'emails.version_release';
         }

app/Http/Controllers/ExternalUsersController.php

@@ -58,7 +58,7 @@ public function handle(Request $request, $project_key)
             {
                 throw new \UnexpectedValueException('the password cannot be empty.', -16003);
             }
-            $data['pwd'] = md5($pwd);
+            $data['pwd'] = $pwd;
         }
 
         $data['project_key'] = $project_key;

app/Http/Controllers/WebhookController.php

@@ -49,7 +49,7 @@ public function exec($type, $project_key)
                 return Response()->json([ 'ecode' => -5, 'emsg' => 'the event has error.' ]);
             }
 
-            $token = env('GITLAB_WEBHOOK_TOKEN', '');
+            $token = $external_user->pwd ?: '';
             if (!$token || $token !== $_SERVER['HTTP_X_GITLAB_TOKEN']) 
             {
                 return Response()->json([ 'ecode' => -1, 'emsg' => 'the token has error.' ]);
@@ -65,7 +65,7 @@ public function exec($type, $project_key)
                 return Response()->json([ 'ecode' => -5, 'emsg' => 'the event has error.' ]);
             }
 
-            $token = env('GITHUB_WEBHOOK_TOKEN', '');
+            $token = $external_user->pwd ?: '';
             if (!$token)
             {
                 return Response()->json([ 'ecode' => -1, 'emsg' => 'the token can not be empty.' ]);