rails_wechat 0.1.1 → 0.1.2

data/app/models/wechat/model/reply/news_reply.rb

@@ -20,5 +20,9 @@ module Wechat
       }
     end
 
+    def has_content?
+      content[:Articles].present?
+    end
+
   end
 end

data/app/models/wechat/model/reply/success_reply.rb

@@ -5,5 +5,9 @@ module Wechat
       {}
     end
 
+    def has_content?
+      true
+    end
+
   end
 end

data/app/models/wechat/model/reply.rb

@@ -22,6 +22,10 @@ module Wechat
       self
     end
 
+    def has_content?
+      value.present?
+    end
+
     def content
       {}
     end

data/app/models/wechat/model/request.rb

@@ -27,7 +27,6 @@ module Wechat
       has_many :extractions, -> { order(id: :asc) }, dependent: :delete_all, inverse_of: :request  # 解析 request body 内容，主要针对文字
       has_many :responses, ->(o){ default_where('request_types-any': o.type) }, foreign_key: :appid, primary_key: :appid
 
-      before_save :generate_wechat_user, if: -> { open_id_changed? && open_id.present? }
       after_create :get_reply!
     end
 
@@ -39,6 +38,34 @@ module Wechat
       }.compact
     end
 
+    def reply_params
+      if wechat_user.attributes['name'].blank?
+        {
+          appid: appid,
+          news_reply_items_attributes: [
+            {
+              title: '请绑定',
+              description: '授权您的信息',
+              url: app.oauth2_url
+            }
+          ]
+        }
+      elsif wechat_user.user.blank?
+        {
+          appid: appid,
+          news_reply_items_attributes: [
+            {
+              title: '请绑定',
+              description: '绑定信息',
+              url: Rails.application.routes.url_for(controller: 'auth/sign', action: 'sign', uid: open_id, host: app.host)
+            }
+          ]
+        }
+      else
+        {}
+      end
+    end
+
     def reply_from_rule
       filtered = RailsWechat.config.rules.find do |_, rule|
         if rule.slice(:msg_type, :event, :event_key) <= self.rule_tag && rule[:body]
@@ -47,8 +74,11 @@ module Wechat
       end
 
       if filtered.present?
-        logger.debug "  -----> Filter Key: #{filtered[1]}"
-        filtered[1][:proc].call(self)
+        logger.debug "\e[35m  Filter Key: #{filtered[1]}  \e[0m"
+        r = filtered[1][:proc].call(self)
+        if r.has_content?
+          r
+        end
       end
     end
 
@@ -68,13 +98,16 @@ module Wechat
       app.api.message_custom_typing(wechat_user.uid, command)
     end
 
-    def bind_url
-      Rails.application.routes.url_for(controller: 'auth/sign', action: 'sign', request_id: id, uid: open_id, host: app.host)
-    end
-
     def generate_wechat_user
       wechat_user || build_wechat_user
       wechat_user.appid = appid
+      if ['SCAN', 'subscribe'].include?(event)
+        if body.to_s.start_with?('invite_by_')
+          wechat_user.user_inviter_id = body.delete_prefix('invite_by_')
+        elsif body.to_s.start_with? 'invite_member_'
+          wechat_user.member_inviter_id = body.delete_prefix('invite_member_')
+        end
+      end
 
       if wechat_user.new_record?
         self.init_wechat_user = true

data/app/models/wechat/model/scene.rb

@@ -17,7 +17,7 @@ module Wechat
 
       has_one :response, ->(o){ where(match_value: o.match_value) }, primary_key: :appid, foreign_key: :appid
       has_one :tag, ->(o){ where(name: o.match_value) }, primary_key: :appid, foreign_key: :appid
-      has_many :scene_menus, dependent: :destroy
+      has_many :scene_menus, dependent: :destroy_async
       has_many :menus, through: :scene_menus
 
       before_validation do
@@ -48,16 +48,29 @@ module Wechat
     alias_method :qrcode_file_url, :qrcode_data_url
 
     def commit_to_wechat
+      if ['Wechat::PublicApp', 'Wechat::ReadApp'].include? app.type
+        get_public_qrcode
+      elsif ['Wechat::ProgramApp'].include? app.type
+        get_program_qrcode
+      end
+
+      self.save
+      self
+    end
+
+    def get_public_qrcode
       if expire_seconds
         r = app.api.qrcode_create_scene self.match_value, expire_seconds
       else
         r = app.api.qrcode_create_limit_scene self.match_value
       end
-
       self.qrcode_ticket = r['ticket']
       self.qrcode_url = r['url']
-      self.save
-      r
+    end
+
+    def get_program_qrcode
+      r = app.api.generate_url
+      self.qrcode_url = r['url_link']
     end
 
     def expired?(time = Time.current)

data/app/models/wechat/model/tag.rb

@@ -13,7 +13,7 @@ module Wechat
       belongs_to :tagging, polymorphic: true, optional: true
       belongs_to :app, foreign_key: :appid, primary_key: :appid
       belongs_to :user_tag, optional: true
-      has_many :user_tags, ->(o){ where(tag_name: o.name) }, primary_key: :appid, foreign_key: :appid, dependent: :destroy
+      has_many :user_tags, ->(o){ where(tag_name: o.name) }, primary_key: :appid, foreign_key: :appid, dependent: :destroy_async
       has_many :wechat_users, through: :user_tags
       has_many :requests, ->(o){ where(type: ['Wechat::ScanRequest', 'Wechat::SubscribeRequest'], body: o.name).order(id: :desc) }, foreign_key: :appid, primary_key: :appid
 

data/app/models/wechat/model/template_config/template_public.rb

@@ -14,7 +14,7 @@ module Wechat
       r
     end
 
-    def sync_key_words(app = WechatPublic.default)
+    def sync_key_words
       if tid.present? && app
         template = app.api.templates.find { |i| i['template_id'] == tid }
         if template.blank?

data/app/models/wechat/model/template_config.rb

@@ -10,9 +10,11 @@ module Wechat
       attribute :notifiable_type, :string
       attribute :code, :string, default: 'default'
       attribute :content, :string
+      attribute :appid, :string
 
       validates :code, uniqueness: { scope: :notifiable_type }
 
+      belongs_to :app, foreign_key: :appid, primary_key: :appid, optional: true
       has_many :template_key_words, -> { order(position: :asc) }, inverse_of: :template_config, dependent: :delete_all
       has_many :templates, dependent: :nullify
       accepts_nested_attributes_for :template_key_words

data/app/models/wechat/model/ticket.rb

@@ -13,6 +13,7 @@ module Wechat
       belongs_to :platform, foreign_key: :appid, primary_key: :appid, optional: true
 
       after_create_commit :parsed_data, if: -> { platform.present? }
+      after_create_commit :clean_last
     end
 
     def parsed_data
@@ -24,5 +25,9 @@ module Wechat
       data
     end
 
+    def clean_last
+      TicketCleanJob.perform_later(self)
+    end
+
   end
 end

data/app/models/wechat/model/user_tag.rb

@@ -13,17 +13,13 @@ module Wechat
       belongs_to :user_tagged, optional: true
 
       after_create_commit :sync_create_later
-      after_destroy_commit :remove_from_wechat_later
+      after_destroy_commit :remove_from_wechat
     end
 
     def sync_create_later
       UserTagJob.perform_later(self)
     end
 
-    def remove_from_wechat_later
-      UserTagRemoveJob.perform_later(self)
-    end
-
     def sync_to_wechat
       if wechat_api
         wechat_api.tag_add_user(tag.tag_id, wechat_user.uid)
@@ -35,7 +31,7 @@ module Wechat
     end
 
     def remove_from_wechat
-      wechat_api.tag_del_user(tag.tag_id, wechat_user.uid) if wechat_api
+      wechat_api.tag_del_user(tag.tag_id, open_id) if wechat_api
     end
 
   end

data/app/views/admin/_wechat_nav.html.erb

@@ -4,8 +4,8 @@
     <%= link_to t('wechat.share.apps.index.title'), { controller: 'wechat/share/apps' }, class: active_helper(controllers: ['wechat/share/apps', 'wechat/share/menus', 'wechat/share/scenes', 'wechat/share/wechat_users'], active: 'is-active') %>
   <% end %>
   <a class="menu-label" data-action="menu#toggle">
-    <i class="fab fa-weixin"></i>
+    <i class="fa-brands fa-weixin"></i>
     <span><%= t('wechat.admin.title') %></span>
-    <i class="fas dropdown"></i>
+    <i class="fa-solid dropdown"></i>
   </a>
 </div>

data/app/views/application/_wx_open_subscribe.html.erb

@@ -0,0 +1,15 @@
+<wx-open-subscribe template="TenvU22BA1jCp4YHfYEpRuESXYReQyDuhs4vbdWA99I" id="subscribe-btn">
+  <script type="text/wxtag-template" slot="style">
+    <style>
+      .subscribe-btn {
+        color: #fff;
+        background-color: #07c160;
+      }
+    </style>
+  </script>
+  <script type="text/wxtag-template">
+    <button class="subscribe-btn">
+      一次性模版消息订阅
+    </button>
+  </script>
+</wx-open-subscribe>

data/app/views/my/_wechat_nav.html+phone.erb

@@ -3,8 +3,8 @@
     <%= link_to t('wechat.panel.template_configs.index.title'), panel_template_configs_path, class: active_helper(controllers: 'template_configs', active: 'is-active') -%>
   <% end %>
   <a class="menu-label" data-action="menu#toggle">
-    <i class="fab fa-weixin"></i>
+    <i class="fa-brands fa-weixin"></i>
     <span><%= t('wechat.panel.title') %></span>
-    <i class="fas dropdown"></i>
+    <i class="fa-light dropdown"></i>
   </a>
 </div>

data/app/views/panel/_wechat_nav.html.erb

@@ -6,8 +6,8 @@
     <%= link_to t('wechat.panel.apps.index.title'), { controller: 'wechat/panel/apps' }, class: active_helper(controllers: 'apps', active: 'is-active') -%>
   <% end %>
   <a class="menu-label" data-action="menu#toggle">
-    <i class="fab fa-weixin"></i>
+    <i class="fa-brands fa-weixin"></i>
     <span><%= t('wechat.panel.title') %></span>
-    <i class="fas dropdown"></i>
+    <i class="fa-solid dropdown"></i>
   </a>
 </div>

data/app/views/wechat/admin/apps/_form.html.erb

@@ -4,3 +4,4 @@
 <%= f.text_field :appid %>
 <%= f.text_field :secret %>
 <%= f.check_box :encrypt_mode %>
+<%= f.text_field :domain %>

data/app/views/wechat/admin/apps/_index_tbody.html.erb

@@ -41,21 +41,9 @@
     <%= f.check_box :enabled, data: { input_target: 'checkbox' }, id: nil, class: 'switch is-rounded' %>
     <label data-action="click->input#check"></label>
   <% end %>
-</td>
-<td>
-  <%= link_to({ controller: 'menus', app_id: model.id }, aria: { label: t('wechat.admin.menus.index.title') }, class: 'button is-small is-rounded is-light') do %>
-    <i class="fas fa-bars"></i>
-  <% end %>
-  <%= link_to({ controller: 'responses', app_id: model.id }, aria: { label: t('wechat.admin.responses.index.title') }, class: 'button is-small is-rounded is-light') do %>
-    <i class="fas fa-reply-all"></i>
-  <% end %>
-  <%= link_to({ controller: 'requests', app_id: model.id }, aria: { label: t('wechat.admin.requests.index.title') }, class: 'button is-small is-rounded is-light') do %>
-    <i class="fas fa-comments"></i>
-  <% end %>
-  <%= link_to({ controller: 'tags', app_id: model.id }, aria: { label: t('wechat.admin.tags.index.title') }, class: 'button is-small is-rounded is-light') do %>
-    <i class="fas fa-user-tag"></i>
-  <% end %>
-  <%= link_to({ controller: 'templates', app_id: model.id }, aria: { label: t('wechat.admin.templates.index.title') }, class: 'button is-small is-rounded is-light') do %>
-    <i class="fas fa-inbox"></i>
+  <%= form_with theme: nil, model: model, scope: :app, url: { action: 'update', id: model.id }, data: { controller: 'input' } do |f| %>
+    <%= f.check_box :inviting, data: { input_target: 'checkbox' }, id: nil, class: 'switch is-rounded' %>
+    <label data-action="click->input#check"></label>
   <% end %>
 </td>
+<td><%= model.domain %></td>

data/app/views/wechat/admin/apps/_index_thead.html.erb

@@ -2,6 +2,9 @@
 <th><%= Wechat::App.human_attribute_name(:name) %></th>
 <th></th>
 <th><%= Wechat::App.human_attribute_name(:encrypt_mode) %></th>
-<th><%= Wechat::App.human_attribute_name(:enabled) %></th>
-<th></th>
+<th>
+  <p><%= Wechat::App.human_attribute_name(:enabled) %></p>
+  <p><%= Wechat::App.human_attribute_name(:inviting) %></p>
+</th>
+<th><%= Wechat::App.human_attribute_name(:domain) %></th>
 <th></th>

data/app/views/wechat/admin/apps/_index_tr.html.erb

@@ -1,22 +1,42 @@
 <tr id="tr_<%= model.id %>" data-controller="show" data-action="mouseenter->show#show mouseleave->show#hide">
   <%= yield %>
   <td>
-    <span data-show-target="item" style="visibility: hidden">
+    <div data-show-target="item" style="visibility: hidden">
+      <%= link_to({ controller: 'menus', app_id: model.id }, aria: { label: t('wechat.admin.menus.index.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-light fa-bars"></i>
+      <% end %>
+      <%= link_to({ controller: 'responses', app_id: model.id }, aria: { label: t('wechat.admin.responses.index.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-light fa-reply-all"></i>
+      <% end %>
+      <%= link_to({ controller: 'requests', app_id: model.id }, aria: { label: t('wechat.admin.requests.index.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-light fa-comments"></i>
+      <% end %>
+      <%= link_to({ controller: 'tags', app_id: model.id }, aria: { label: t('wechat.admin.tags.index.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-light fa-user-tag"></i>
+      <% end %>
+      <%= link_to({ controller: 'templates', app_id: model.id }, aria: { label: t('wechat.admin.templates.index.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-light fa-inbox"></i>
+      <% end %>
+    </div>
+    <div data-show-target="item" class="mt-1" style="visibility: hidden">
       <%= link_to({ action: 'info', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('wechat.admin.apps.info.title') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-cog"></i>
+        <i class="fa-light fa-cog"></i>
+      <% end %>
+      <%= link_to({ action: 'edit_pay', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('wechat.admin.apps.edit_pay.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-brands fa-amazon-pay"></i>
       <% end %>
       <%= link_to({ action: 'edit_cert', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('wechat.admin.apps.edit_cert.title') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-certificate"></i>
+        <i class="fa-light fa-certificate"></i>
       <% end %>
       <%= link_to({ action: 'show', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.show') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-info"></i>
+        <i class="fa-light fa-circle-info"></i>
       <% end %>
       <%= link_to({ action: 'edit', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-pencil-alt"></i>
+        <i class="fa-light fa-pencil"></i>
       <% end %>
       <%= button_to({ action: 'destroy', id: model.id }, method: :delete, aria: { label: t('.destroy') }, data: { confirm: t('.confirm') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-trash-alt"></i>
+        <i class="fa-light fa-trash"></i>
       <% end %>
-    </span>
+    </div>
   </td>
 </tr>

data/app/views/wechat/admin/apps/_pay_form.html.erb

@@ -1,7 +1,10 @@
-<div class="level">
-  <h4 class="level-item has-text-centered">微信支付</h4>
-</div>
-<%= f.text_field :mch_id %>
-<%= f.text_field :key %>
-<%= f.text_field :key_v3 %>
-<%= f.text_field :serial_no %>
+<%= form_with model: @app, scope: :app, url: { action: 'update' } do |f| %>
+  <div class="level">
+    <h4 class="level-item has-text-centered">微信支付</h4>
+  </div>
+  <%= f.text_field :mch_id %>
+  <%= f.text_field :key %>
+  <%= f.text_field :key_v3 %>
+  <%= f.text_field :serial_no %>
+  <%= f.submit %>
+<% end %>

data/app/views/wechat/admin/apps/edit_cert.html.erb

@@ -1,3 +1,3 @@
-<turbo-frame id="modal">
+<%= turbo_frame_tagged 'modal' do %>
   <%= render partial: 'cert_form' %>
-</turbo-frame>
+<% end %>

data/app/views/wechat/admin/apps/edit_pay.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tagged 'modal' do %>
+  <%= render partial: 'pay_form' %>
+<% end %>

data/app/views/wechat/admin/apps/update_cert.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.append 'body' do %>
+  <div data-controller="visit"></div>
+<% end %>

data/app/views/wechat/admin/{menus → base}/_breadcrumb.html.erb

@@ -2,6 +2,7 @@
   <ul>
     <li><%= link_to t('wechat.admin.apps.index.title'), { controller: 'apps' } %></li>
     <% if @app %>
+      <li><%= link_to @app.type_i18n, { controller: 'apps', type: @app.type } %></li>
       <li><%= link_to @app.name, { controller: 'apps', id: @app.id } %></li>
     <% end %>
     <li class="is-active"><%= t('.title') %></li>

data/app/views/wechat/admin/base/_wechat_nav_user.html.erb

@@ -1,11 +1,3 @@
-<div class="breadcrumb has-succeeds-separator">
-  <ul>
-    <li><%= link_to t('wechat.admin.apps.index.title'), { controller: 'apps' } %></li>
-    <li><%= link_to @app.name, { controller: 'apps', id: @app.id } %></li>
-    <li class="is-active"><%= t('.title') %></li>
-  </ul>
-</div>
-
 <div class="tabs">
   <ul>
     <li class="<%= active_helper(controllers: 'tags', active: 'is-active') %>">

data/app/views/wechat/admin/extractors/_form.html.erb

@@ -10,12 +10,12 @@
 <div class="field is-horizontal">
   <%= f.label :start_at %>
   <div class="field-body">
-    <%= f.time_select :start_at, start_hour: 0, end_hour: 23, minute_step: 30, default: { hour: 0, min: 0 }, wrap: { all: 'field is-narrow', select: 'select' }, on: { label: false } %>
+    <%= f.time_select :start_at, start_hour: 0, end_hour: 23, minute_step: 30, default: { hour: 0, min: 0 }, wrap: { all: 'field is-narrow', select: 'select' }, label: nil %>
   </div>
 </div>
 <div class="field is-horizontal">
   <%= f.label :finish_at %>
   <div class="field-body">
-    <%= f.time_select :finish_at, start_hour: 0, end_hour: 23, minute_step: 30, default: { hour: 23, min: 59 }, wrap: { all: 'field is-narrow', select: 'select' }, on: { label: false } %>
+    <%= f.time_select :finish_at, start_hour: 0, end_hour: 23, minute_step: 30, default: { hour: 23, min: 59 }, wrap: { all: 'field is-narrow', select: 'select' }, label: nil %>
   </div>
 </div>

data/app/views/wechat/admin/menus/_button.html.erb

@@ -1,9 +1,9 @@
 <%= button_to({ action: 'sync', appid: params[:appid] }, method: :post, class: 'button is-link') do %>
-  <i class="fas fa-sync"></i><span><% t('.sync') %></span>
+  <i class="fa-light fa-sync"></i><span><% t('.sync') %></span>
 <% end %>
 <%= link_to({ action: 'new', appid: params[:appid] }, data: { turbo_frame: 'modal' }, class: 'button is-link') do %>
-  <i class="fas fa-plus"></i><span><% t('.new') %></span>
+  <i class="fa-light fa-plus"></i><span><% t('.new') %></span>
 <% end %>
 <%= link_to({ action: 'new_parent', appid: params[:appid] }, data: { turbo_frame: 'modal' }, class: 'button is-link') do %>
-  <i class="fas fa-plus"></i><span><% t('.new_parent') %></span>
+  <i class="fa-light fa-plus"></i><span><% t('.new_parent') %></span>
 <% end %>

data/app/views/wechat/admin/menus/_index_tbody.html.erb

@@ -1,9 +1,9 @@
 <td>
   <span style="width: <%= model.parent_id ? 1.43 : 0 %>em; display: inline-block"></span>
   <% if model.children.size > 0 %>
-    <i class="fas fa-fw fa-caret-down" data-action="click->tree#collapse" style="cursor: pointer"></i>
+    <i class="fa-solid fa-fw fa-caret-down" style="cursor: pointer" data-action="click->tree#collapse"></i>
   <% else %>
-    <i class="fas fa-fw fa-minus"></i>
+    <i class="fa-light fa-fw fa-minus"></i>
   <% end %>
   <%= model.type_i18n %>
 </td>

data/app/views/wechat/admin/menus/_index_tr.html.erb

@@ -5,15 +5,15 @@
       <% if model.appid.to_s == @app.appid %>
         <% if model.type == 'Wechat::ParentMenu' %>
           <%= link_to({ action: 'edit_parent', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
-            <i class="fas fa-pencil-alt"></i>
+            <i class="fa-light fa-pencil"></i>
           <% end %>
         <% else %>
           <%= link_to({ action: 'edit', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
-            <i class="fas fa-pencil-alt"></i>
+            <i class="fa-light fa-pencil"></i>
           <% end %>
         <% end %>
         <%= button_to({ action: 'destroy', id: model.id }, method: :delete, data: { confirm: t('.confirm') }, aria: { label: t('.destroy') }, class: 'button is-small is-rounded is-light') do %>
-          <i class="fas fa-trash-alt"></i>
+          <i class="fa-light fa-trash"></i>
         <% end %>
       <% end %>
     </span>

data/app/views/wechat/admin/registers/_button.html.erb

@@ -1,3 +1,3 @@
 <%= link_to({ action: 'new' }, data: { turbo_frame: 'modal' }, class: 'button is-link') do %>
-  <i class="fas fa-plus"></i><span><%= t('.new') %></span>
+  <i class="fa-light fa-plus"></i><span><%= t('.new') %></span>
 <% end %>

data/app/views/wechat/admin/registers/_index_tbody.html.erb

@@ -11,7 +11,7 @@
   <p>
     <%= model.mobile %>
     <%= link_to code_admin_register_path(model), method: :put, aria: { label: '验证码' }, data: { confirm: t('.confirm') }, class: 'button is-small is-rounded is-light' do %>
-      <i class="fas fa-paper-plane"></i>
+      <i class="fa-light fa-paper-plane"></i>
     <% end %>
   </p>
   <p><%= model.mobile_code %></p>
@@ -20,13 +20,13 @@
   <p>
     <%= image_tag model.bind_qrcode, class: 'image is-24x24' if model.bind_qrcode.attached? %>
     <%= link_to bind_admin_register_path(model), aria: { label: t('.bind') }, class: 'button is-small is-rounded is-light' do %>
-      <i class="fas fa-qrcode"></i>
+      <i class="fa-light fa-qrcode"></i>
     <% end %>
   </p>
   <p>
     <%= image_tag model.qrcode, class: 'image is-24x24' if model.qrcode.attached? %>
     <%= link_to qrcode_admin_register_path(model), aria: { label: t('.qrcode') }, class: 'button is-small is-rounded is-light' do %>
-      <i class="fas fa-qrcode"></i>
+      <i class="fa-light fa-qrcode"></i>
     <% end %>
   </p>
 </td>

data/app/views/wechat/admin/registers/_index_tr.html.erb

@@ -3,22 +3,22 @@
   <td>
     <span data-show-target="item" style="visibility: hidden">
       <%= link_to assign_admin_register_path(model), aria: { label: '分配' }, class: 'button is-small is-rounded is-light' do %>
-        <i class="fas fa-hand-point-right"></i>
+        <i class="fa-light fa-hand-point-right"></i>
       <% end %>
       <%= link_to app_admin_register_path(model), aria: { label: t('.app') }, class: 'button is-small is-rounded is-light' do %>
-        <i class="fab fa-weixin"></i>
+        <i class="fa-brands fa-weixin"></i>
       <% end %>
       <%= link_to({ controller: 'bench/me/tasks', tasking_type: 'Register', tasking_id: model.id }, aria: { label: t('.tasks') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-tasks"></i>
+        <i class="fa-light fa-tasks"></i>
       <% end %>
       <%= link_to({ action: 'show', id: model.id }, aria: { label: t('.show') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-info"></i>
+        <i class="fa-light fa-circle-info"></i>
       <% end %>
       <%= link_to({ action: 'edit', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-pencil-alt"></i>
+        <i class="fa-light fa-pencil"></i>
       <% end %>
       <%= button_to({ action: 'destroy', id: model.id }, method: :delete, aria: { label: t('.destroy') }, data: { confirm: t('.confirm') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-trash-alt"></i>
+        <i class="fa-light fa-trash"></i>
       <% end %>
     </span>
   </td>

data/app/views/wechat/admin/replies/_index_tbody.html.erb

@@ -11,7 +11,7 @@
         <div class="media-right">
           <%= image_tag item.pic_url, class: 'image is-64x64' if item.pic_url.present? %>
           <%= button_to({ controller: 'news_reply_items', action: 'destroy', reply_id: model.id, id: item.id }, method: :delete) do %>
-            <i class="fas fa-times"></i>
+            <i class="fa-light fa-times"></i>
           <% end %>
         </div>
       </article>
@@ -19,7 +19,7 @@
     <article class="media">
       <div class="content">
         <%= link_to({ action: 'add', id: model.id }, data: { turbo_frame: 'modal' }) do %>
-          <i class="fas fa-plus"></i><span><%= t('.add') %></span>
+          <i class="fa-light fa-plus"></i><span><%= t('.add') %></span>
         <% end %>
       </div>
     </article>

data/app/views/wechat/admin/requests/_button.html.erb

@@ -1,3 +1,3 @@
 <%= link_to({ controller: 'datum/panel/table_lists', action: 'find', data_list_id: 'RequestDailyExport', **params.permit('created_at-gte', 'created_at-lte') }, data: { turbo_frame: 'modal' }, class: 'button is-link is-small') do %>
-  <i class="fas fa-file-excel"></i><span><%= t('.export') %></span>
+  <i class="fa-light fa-file-excel"></i><span><%= t('.export') %></span>
 <% end %>

data/app/views/wechat/admin/requests/_index_tr.html.erb

@@ -3,10 +3,10 @@
   <td>
     <span data-show-target="item" style="visibility: hidden">
       <%= link_to({ action: 'show', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.show') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-info"></i>
+        <i class="fa-light fa-circle-info"></i>
       <% end %>
       <%= button_to({ action: 'destroy', id: model.id }, method: :delete, data: { confirm: t('.confirm') }, aria: { label: t('.destroy') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fas fa-trash-alt"></i>
+        <i class="fa-light fa-trash"></i>
       <% end %>
     </span>
   </td>

data/app/views/wechat/admin/responses/_index_tbody.html.erb

@@ -19,7 +19,7 @@
   <p>
     <span><%= model.reply.type_i18n %></span>
     <%= link_to({ action: 'edit_reply', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
-      <i class="fas fa-pencil-alt"></i>
+      <i class="fa-light fa-pencil"></i>
     <% end %>
   </p>
   <p><%= model.reply.value %></p>

data/app/views/wechat/admin/responses/_index_thead.html.erb

@@ -8,7 +8,7 @@
 <th>
   <%= Wechat::Response.human_attribute_name(:reply_id) %>
   <%= link_to({ controller: 'replies' }, aria: { label: t('wechat.admin.replies.index.title') }) do %>
-    <i class="fas fa-cog"></i>
+    <i class="fa-light fa-cog"></i>
   <% end %>
 </th>
 <th></th>