From e7bbe252deba05f4625d694fa5b9509f46ae8af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 15:37:22 +0800
Subject: [PATCH 01/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 13 +++++++++++++
 app/helpers/projects_helper.rb      |  9 +++++++++
 app/views/users/info.json.jbuilder  | 11 +++++++++++
 config/routes.rb                    |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 app/views/users/info.json.jbuilder

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ff1d4b887..c70f053f6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -109,6 +109,19 @@ class UsersController < ApplicationController
     @user = current_user
   end
 
+  # cloudIDE saas定制
+  def info
+    @code = 1001
+    @message = "用户不存在"
+    if params[:token].present?
+      @user = User.try_to_autologin(params[:token])
+      if @user.present?
+        @code = 1000
+        @message = "success"
+      end
+    end
+  end
+
   # 贴吧获取用户信接口
   def get_user_info
     begin
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index c9ea87f9a..41d8d5bf1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,6 +65,7 @@ module ProjectsHelper
       license_id: project.license_id,
       jianmu_devops: jianmu_devops_code(project, user),
       jianmu_devops_url: jianmu_devops_url,
+      cloud_ide_saas_url: cloud_ide_saas_url(user),
       ignore_id: project.ignore_id
     }).compact
 
@@ -128,6 +129,14 @@ module ProjectsHelper
     EduSetting.get("jianmu_devops_url") || "https://ci-v3.test.jianmuhub.com"
   end
 
+
+  def cloud_ide_saas_url(user)
+    token = Token.get_token_from_user(user, "autologin")
+    oauth_url = "#{Rails.application.config_for(:configuration)['platform_url']}/api/users/info.json"
+    saas_url = EduSetting.get("cloud_ide_saas_url") || "https://saasfactory.test.opentrs.com"
+    "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token}"
+  end
+
   def aes_encrypt(key, des_text)
     # des_text='{"access_key_id":"STS.NTuC9RVmWfJqj3JkcMzPnDf7X","access_key_secret":"E8NxRZWGNxxMfwgt5nFLnBFgg6AzgXCZkSNCyqygLuHM","end_point":"oss-accelerate.aliyuncs.com","security_token":"CAIS8gF1q6Ft5B2yfSjIr5fACIPmu7J20YiaaBX7j2MYdt9Cq6Ocujz2IHhMenVhA+8Wv/02n2hR7PcYlq9IS55VWEqc/VXLaywQo22beIPkl5Gfz95t0e+IewW6Dxr8w7WhAYHQR8/cffGAck3NkjQJr5LxaTSlWS7OU/TL8+kFCO4aRQ6ldzFLKc5LLw950q8gOGDWKOymP2yB4AOSLjIx6lAt2T8vs/7hmZPFukSFtjCglL9J/baWC4O/csxhMK14V9qIx+FsfsLDqnUIs0YWpf0p3P0doGyf54vMWUM05A6dduPS7txkLAJwerjVl1/ADxc0/hqAASXhPeiktbmDjwvnSn4iKcSGQ+xoQB468eHXNdvf13dUlbbE1+JhRi0pZIB2UCtN9oTsLHcwIHt+EJaoMd3+hGwPVmvHSXzECDFHylZ8l/pzTwlE/aCtZyVmI5cZEvmWu2xBa3GRbULo7lLvyeX1cHTVmVWf4Nk6D09PzTU8qlAj","bucket":"edu-bigfiles1","region":"oss-cn-hangzhou","callback_url":"https://data.educoder.net/api/buckets/callback.json","bucket_host":"data.educoder.net"}'
     # des = OpenSSL::Cipher::Cipher.new('aes-256-ctr')
diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
new file mode 100644
index 000000000..ac19f3418
--- /dev/null
+++ b/app/views/users/info.json.jbuilder
@@ -0,0 +1,11 @@
+json.code @code
+json.message @message
+json.userInfoBo do
+  json.name @user.real_name
+  json.userEmail @user.mail
+  json.phone @user.phone
+  json.login @user.login
+  json.user_id @user.id
+  json.image_url url_to_avatar(@user)
+  json.admin @user.admin
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 52d8a6dc3..1185abd86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -258,6 +258,7 @@ Rails.application.routes.draw do
         post :attendance
         get :system_update
         get :me
+        get :info
         get :list
         post :sync_token
         post :sync_gitea_pwd

From c668fd3530b538d9debf3767a7c7b4f75afa9ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 15:38:40 +0800
Subject: [PATCH 02/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c70f053f6..1df30532d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -113,7 +113,7 @@ class UsersController < ApplicationController
   def info
     @code = 1001
     @message = "用户不存在"
-    if params[:token].present?
+    if params[:token].present? && current_user.logged?
       @user = User.try_to_autologin(params[:token])
       if @user.present?
         @code = 1000

From 6d2a6e0331057f585278fd186460e437a3fd60d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 15:44:46 +0800
Subject: [PATCH 03/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/projects_helper.rb     |  3 ++-
 app/views/users/info.json.jbuilder | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 41d8d5bf1..b4c21e044 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -131,10 +131,11 @@ module ProjectsHelper
 
 
   def cloud_ide_saas_url(user)
+    "" unless user.logged?
     token = Token.get_token_from_user(user, "autologin")
     oauth_url = "#{Rails.application.config_for(:configuration)['platform_url']}/api/users/info.json"
     saas_url = EduSetting.get("cloud_ide_saas_url") || "https://saasfactory.test.opentrs.com"
-    "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token}"
+    "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token.value}"
   end
 
   def aes_encrypt(key, des_text)
diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index ac19f3418..64ae9fa93 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -1,11 +1,13 @@
 json.code @code
 json.message @message
-json.userInfoBo do
-  json.name @user.real_name
-  json.userEmail @user.mail
-  json.phone @user.phone
-  json.login @user.login
-  json.user_id @user.id
-  json.image_url url_to_avatar(@user)
-  json.admin @user.admin
+if @user.present?
+  json.userInfoBo do
+    json.name @user.real_name
+    json.userEmail @user.mail
+    json.phone @user.phone
+    json.login @user.login
+    json.user_id @user.id
+    json.image_url url_to_avatar(@user)
+    json.admin @user.admin
+  end
 end
\ No newline at end of file

From 8b1f06f010955242fbe54785250181431083db38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 15:58:46 +0800
Subject: [PATCH 04/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1df30532d..c70f053f6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -113,7 +113,7 @@ class UsersController < ApplicationController
   def info
     @code = 1001
     @message = "用户不存在"
-    if params[:token].present? && current_user.logged?
+    if params[:token].present?
       @user = User.try_to_autologin(params[:token])
       if @user.present?
         @code = 1000

From bf1e7220849b4fea3bdb9d7d3076eda531a236c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 16:04:27 +0800
Subject: [PATCH 05/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/info.json.jbuilder | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index 64ae9fa93..7e4ec1bd6 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -5,9 +5,5 @@ if @user.present?
     json.name @user.real_name
     json.userEmail @user.mail
     json.phone @user.phone
-    json.login @user.login
-    json.user_id @user.id
-    json.image_url url_to_avatar(@user)
-    json.admin @user.admin
   end
 end
\ No newline at end of file

From f031cd47209d28d2124eec7f514f68ad1393f6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 16:34:44 +0800
Subject: [PATCH 06/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/info.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index 7e4ec1bd6..4ec6b4c14 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -1,5 +1,6 @@
 json.code @code
 json.message @message
+json.status @code == 1000
 if @user.present?
   json.userInfoBo do
     json.name @user.real_name

From c2673bd48d701047a3b4abcc328cc7f775947b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 16:37:54 +0800
Subject: [PATCH 07/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/info.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index 4ec6b4c14..354fced16 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -6,5 +6,6 @@ if @user.present?
     json.name @user.real_name
     json.userEmail @user.mail
     json.phone @user.phone
+    json.tenantCode "TI1001383"
   end
 end
\ No newline at end of file

From 483c8d5410fb859e9ea17e2a775a48eccf255090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 16:42:45 +0800
Subject: [PATCH 08/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/info.json.jbuilder | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index 354fced16..1ad5a80f6 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -1,11 +1,11 @@
 json.code @code
-json.message @message
+# json.message @message
 json.status @code == 1000
 if @user.present?
-  json.userInfoBo do
+  json.userInfoBO do
     json.name @user.real_name
     json.userEmail @user.mail
-    json.phone @user.phone
+    # json.phone @user.phone
     json.tenantCode "TI1001383"
   end
 end
\ No newline at end of file

From c2742f0ae7de62c72280b7c6d77b44a44ba52f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 16:46:15 +0800
Subject: [PATCH 09/10] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/info.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index 1ad5a80f6..7435a8295 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -5,7 +5,7 @@ if @user.present?
   json.userInfoBO do
     json.name @user.real_name
     json.userEmail @user.mail
-    # json.phone @user.phone
-    json.tenantCode "TI1001383"
+    json.phone @user.phone
+    # json.tenantCode "TI1001383"
   end
 end
\ No newline at end of file

From 4b0609931ae7959c8e622f0f4f3ec25ffa1436bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Fri, 14 Oct 2022 11:59:48 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/mailers/user_mailer.rb | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 21ed5b0d5..19f565183 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -1,15 +1,16 @@
-class UserMailer < ApplicationMailer
-  # 注意：这个地方一定要和你的邮箱服务域名一致
-  default from: 'notification@trustie.org'
-
-  # 用户注册验证码
-  def register_email(mail, code)
-    @code = code
-    mail(to: mail, subject: 'Gitink | 注册验证码')
-  end
-
-  def update_email(mail, code)
-    @code = code
-    mail(to: mail, subject: 'Gitink | 更改邮箱验证码')
-  end
-end
+class UserMailer < ApplicationMailer
+  # 注意：这个地方一定要和你的邮箱服务域名一致
+  # default from: 'notification@trustie.org'
+  default from: 'noreply@gitlink.org.cn'
+
+  # 用户注册验证码
+  def register_email(mail, code)
+    @code = code
+    mail(to: mail, subject: 'Gitink | 注册验证码')
+  end
+
+  def update_email(mail, code)
+    @code = code
+    mail(to: mail, subject: 'Gitink | 更改邮箱验证码')
+  end
+end