diff --git a/app/controllers/weapps/code_sessions_controller.rb b/app/controllers/weapps/code_sessions_controller.rb index a99a048e2..c92c3cb70 100644 --- a/app/controllers/weapps/code_sessions_controller.rb +++ b/app/controllers/weapps/code_sessions_controller.rb @@ -30,7 +30,7 @@ class Weapps::CodeSessionsController < Weapps::BaseController set_session_openid(result['openid']) set_weapp_session_key(result['session_key']) # weapp session_key写入缓存 后续解密需要 - render_ok(openid: result['openid'], logged: logged) + render_ok(openid: result['openid'], logged: logged) unless logged rescue Wechat::Error => ex render_error(ex.message) end diff --git a/app/controllers/weapps/sessions_controller.rb b/app/controllers/weapps/sessions_controller.rb index f65111399..371a3f7d3 100644 --- a/app/controllers/weapps/sessions_controller.rb +++ b/app/controllers/weapps/sessions_controller.rb @@ -19,6 +19,5 @@ class Weapps::SessionsController < Weapps::BaseController OpenUsers::Wechat.create!(user: user, uid: session_unionid) if user.wechat_open_user.blank? successful_authentication(user) - render_ok end end \ No newline at end of file diff --git a/app/models/competition_team.rb b/app/models/competition_team.rb index 6c2b99859..a05ceb032 100644 --- a/app/models/competition_team.rb +++ b/app/models/competition_team.rb @@ -28,7 +28,7 @@ class CompetitionTeam < ApplicationRecord while self.class.exists?(invite_code: code) code = CODE_CHARS.sample(6).join end - self.code = code + self.invite_code = code code end diff --git a/app/views/weapps/code_sessions/create.json.jbuilder b/app/views/weapps/code_sessions/create.json.jbuilder new file mode 100644 index 000000000..280086948 --- /dev/null +++ b/app/views/weapps/code_sessions/create.json.jbuilder @@ -0,0 +1,3 @@ +json.user do + json.partial! 'weapps/shared/user', locals: { user: current_user } +end \ No newline at end of file diff --git a/app/views/weapps/sessions/create.json.jbuilder b/app/views/weapps/sessions/create.json.jbuilder new file mode 100644 index 000000000..280086948 --- /dev/null +++ b/app/views/weapps/sessions/create.json.jbuilder @@ -0,0 +1,3 @@ +json.user do + json.partial! 'weapps/shared/user', locals: { user: current_user } +end \ No newline at end of file diff --git a/app/views/weapps/shared/_user.json.jbuilder b/app/views/weapps/shared/_user.json.jbuilder new file mode 100644 index 000000000..be67384cc --- /dev/null +++ b/app/views/weapps/shared/_user.json.jbuilder @@ -0,0 +1,14 @@ +json.username user.full_name +json.real_name user.real_name +json.login user.login +json.user_id user.id +json.image_url url_to_avatar(user) +json.admin user.admin? +json.business user.business? +json.is_teacher user.user_extension&.teacher? +json.user_identity user.identity +json.tidding_count 0 +json.user_phone_binded user.phone.present? +json.phone user.phone +json.profile_completed user.profile_completed? +json.professional_certification user.professional_certification \ No newline at end of file