rails_wechat 0.1.1 → 0.1.2

data/lib/rails_wechat.rb

@@ -3,7 +3,6 @@
 # engine
 require 'rails_wechat/engine'
 require 'rails_wechat/config'
-require 'rails_wechat/helpers'
 
 # omniauth
 #require 'omniauth/strategies/wechat'

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: rails_wechat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails_com
+  name: rails_extend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails_auth
+  name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rqrcode
+  name: httpx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: http-form_data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: 微信集成一揽子解决方案
 email:
 - mingyuan0715@foxmail.com
@@ -132,6 +146,7 @@ files:
 - app/controllers/wechat/share/wechat_users_controller.rb
 - app/controllers/wechat/wechat_controller.rb
 - app/controllers/wechat/wechats_controller.rb
+- app/helpers/wechat/application_helper.rb
 - app/jobs/wechat/agency_job.rb
 - app/jobs/wechat/annunciate_job.rb
 - app/jobs/wechat/file_reply_upload_job.rb
@@ -139,10 +154,10 @@ files:
 - app/jobs/wechat/notice_send_job.rb
 - app/jobs/wechat/qrcode_job.rb
 - app/jobs/wechat/tag_job.rb
+- app/jobs/wechat/ticket_clean_job.rb
 - app/jobs/wechat/user_info_job.rb
 - app/jobs/wechat/user_job.rb
 - app/jobs/wechat/user_tag_job.rb
-- app/jobs/wechat/user_tag_remove_job.rb
 - app/mailboxes/application_mailbox.rb
 - app/mailboxes/wechat_mailbox.rb
 - app/models/app/wechat/mobile_app.rb
@@ -194,6 +209,7 @@ files:
 - app/models/wechat/application_record.rb
 - app/models/wechat/auth.rb
 - app/models/wechat/ext/effective.rb
+- app/models/wechat/ext/member.rb
 - app/models/wechat/ext/organ.rb
 - app/models/wechat/ext/subscribed.rb
 - app/models/wechat/ext/user.rb
@@ -295,6 +311,7 @@ files:
 - app/models/wechat/ticket.rb
 - app/models/wechat/user_tag.rb
 - app/views/admin/_wechat_nav.html.erb
+- app/views/application/_wx_open_subscribe.html.erb
 - app/views/application/wechat_require_login.json.jbuilder
 - app/views/my/_wechat_nav.html+phone.erb
 - app/views/my/_wechat_nav.html.erb
@@ -316,9 +333,12 @@ files:
 - app/views/wechat/admin/apps/_show_table.html.erb
 - app/views/wechat/admin/apps/_wechat_app.json.jbuilder
 - app/views/wechat/admin/apps/edit_cert.html.erb
+- app/views/wechat/admin/apps/edit_pay.html.erb
 - app/views/wechat/admin/apps/index.html.erb
 - app/views/wechat/admin/apps/index.json.jbuilder
 - app/views/wechat/admin/apps/info.html.erb
+- app/views/wechat/admin/apps/update_cert.turbo_stream.erb
+- app/views/wechat/admin/base/_breadcrumb.html.erb
 - app/views/wechat/admin/base/_nav.html.erb
 - app/views/wechat/admin/base/_wechat_nav_user.html.erb
 - app/views/wechat/admin/extractors/_breadcrumb.html.erb
@@ -330,7 +350,6 @@ files:
 - app/views/wechat/admin/extractors/_new_form.html.erb
 - app/views/wechat/admin/extractors/_show_table.html.erb
 - app/views/wechat/admin/extractors/index.html.erb
-- app/views/wechat/admin/menus/_breadcrumb.html.erb
 - app/views/wechat/admin/menus/_button.html.erb
 - app/views/wechat/admin/menus/_edit_form.html.erb
 - app/views/wechat/admin/menus/_edit_parent_form.html.erb
@@ -388,7 +407,6 @@ files:
 - app/views/wechat/admin/replies/build.turbo_stream.erb
 - app/views/wechat/admin/replies/index.html.erb
 - app/views/wechat/admin/replies/index.js
-- app/views/wechat/admin/requests/_breadcrumb.html.erb
 - app/views/wechat/admin/requests/_button.html.erb
 - app/views/wechat/admin/requests/_filter_form.html.erb
 - app/views/wechat/admin/requests/_filter_table.html.erb
@@ -425,7 +443,6 @@ files:
 - app/views/wechat/admin/tags/_show_table.html.erb
 - app/views/wechat/admin/tags/index.html.erb
 - app/views/wechat/admin/tags/sync.turbo_stream.erb
-- app/views/wechat/admin/templates/_breadcrumb.html.erb
 - app/views/wechat/admin/templates/_button.html.erb
 - app/views/wechat/admin/templates/_edit_form.html.erb
 - app/views/wechat/admin/templates/_filter_form.html.erb
@@ -436,6 +453,7 @@ files:
 - app/views/wechat/admin/templates/_new_form.html.erb
 - app/views/wechat/admin/templates/_show_table.html.erb
 - app/views/wechat/admin/templates/index.html.erb
+- app/views/wechat/admin/templates/sync.turbo_stream.erb
 - app/views/wechat/admin/wechat_users/_edit_form.html.erb
 - app/views/wechat/admin/wechat_users/_filter_form.html.erb
 - app/views/wechat/admin/wechat_users/_index_tbody.html.erb
@@ -469,9 +487,9 @@ files:
 - app/views/wechat/my/subscribes/_form.html.erb
 - app/views/wechat/my/subscribes/_show_table.html.erb
 - app/views/wechat/my/subscribes/index.html.erb
+- app/views/wechat/my/users/_request.html.erb
 - app/views/wechat/my/users/invite_qrcode.html+phone.erb
 - app/views/wechat/my/users/invite_qrcode.html.erb
-- app/views/wechat/my/users/requests.html+phone.erb
 - app/views/wechat/panel/agencies/_breadcrumb.html.erb
 - app/views/wechat/panel/agencies/_button.html.erb
 - app/views/wechat/panel/agencies/_edit_form.html.erb
@@ -591,7 +609,6 @@ files:
 - lib/rails_wechat.rb
 - lib/rails_wechat/config.rb
 - lib/rails_wechat/engine.rb
-- lib/rails_wechat/helpers.rb
 - lib/rails_wechat/version.rb
 homepage: https://github.com/work-design/rails_wechat
 licenses:

data/app/jobs/wechat/user_tag_remove_job.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Wechat
-  class UserTagRemoveJob < ApplicationJob
-
-    def perform(wechat_user_tag)
-      wechat_user_tag.remove_from_wechat
-    end
-
-  end
-end

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

@@ -1,7 +0,0 @@
-<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>

data/app/views/wechat/admin/templates/_breadcrumb.html.erb

@@ -1,7 +0,0 @@
-<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>

data/app/views/wechat/my/users/requests.html+phone.erb

@@ -1,53 +0,0 @@
-<div class="box">
-  <p class="has-text-centered"><%= current_user.name %></p>
-  <figure class="image">
-    <%= image_tag @scene.qrcode_file_url if @scene %>
-  </figure>
-</div>
-<div class="weui-panel" style="padding-top: 1px">
-  <div class="weui-panel__hd p-0">
-    <div class="weui-navbar">
-      <%= link_to({ action: 'invite_qrcode' }, class: 'weui-navbar__item') do %>
-        邀请列表
-      <% end %>
-      <%= link_to({ action: 'requests' }, class: 'weui-navbar__item weui-bar__item_on') do %>
-        邀请记录
-      <% end %>
-    </div>
-  </div>
-  <div class="weui-panel__bd">
-    <div class="weui-cells mt-0">
-    <% @requests.each do |request| %>
-      <div class="weui-media-box weui-media-box_appmsg">
-        <div class="weui-media-box__hd">
-        <% if request.wechat_user.avatar_url.present? %>
-          <%= image_tag request.wechat_user.avatar_url, class: 'weui-media-box__thumb' %>
-        <% end %>
-        </div>
-        <div class="weui-media-box__bd">
-          <h4 class="weui-media-box__title">
-            <span><%= request.wechat_user.name %></span>
-            <span class="weui-badge"><%= request.type_i18n %></span>
-            <% if request.wechat_user.request_id == request.id %>
-              <span class="tag is-success">邀请成功</span>
-            <% else %>
-              <span class="tag">曾注册用户</span>
-            <% end %>
-          </h4>
-          <ul class="weui-media-box__info">
-            <li class="weui-media-box__info__meta">
-              <span><%= request.init_wechat_user_i18n %></span>
-              <% unless request.init_wechat_user %>
-                <time data-controller="time"><%= request.wechat_user.created_at.to_s(:rfc822) %></time>
-              <% end %>
-            </li>
-            <li class="weui-media-box__info__meta weui-media-box__info__meta_extra"><time data-controller="time" data-format="MM-DD HH:mm:ss"><%= request.created_at.to_s(:rfc822) %></time></li>
-          </ul>
-        </div>
-      </div>
-    <% end %>
-    </div>
-  </div>
-</div>
-
-<%= paginate @requests, window: 1 %>

data/lib/rails_wechat/helpers.rb

@@ -1,32 +0,0 @@
-module WechatHelpers
-
-  def wechat_raw_config_js(debug: false, apis: [])
-    page_url = controller.request.original_url
-    page_url.delete_suffix!('#')
-    js_hash = Wechat::Signature.signature(current_wechat_app.jsapi_ticket, page_url)
-    logger.debug "  \e[35m=====> Current page is: #{page_url}, Hash: #{js_hash.inspect} <=====\e[0m"
-
-    <<-WECHAT_CONFIG_JS
-wx.config({
-  debug: #{debug},
-  appId: '#{current_wechat_app.appid}',
-  timestamp: '#{js_hash[:timestamp]}',
-  nonceStr: '#{js_hash[:noncestr]}',
-  signature: '#{js_hash[:signature]}',
-  jsApiList: ['#{apis.join("','")}']
-})
-WECHAT_CONFIG_JS
-  rescue => e
-    logger.debug e.message
-  end
-
-  def wechat_config_js(debug: false, apis: [])
-    config_js = wechat_raw_config_js(debug: debug, apis: apis)
-    javascript_tag config_js, type: 'application/javascript', nonce: true
-  end
-
-end
-
-ActiveSupport.on_load :action_view do
-  include WechatHelpers
-end