From 9926f185a4bdeeb9c11656057d1ed641f2710eeb Mon Sep 17 00:00:00 2001
From: qinmingyuan <mingyuan0715@foxmail.com>
Date: Sat, 21 Oct 2023 16:49:28 +0800
Subject: [PATCH] no more old app

---
 Gemfile.lock                                      | 10 +++++-----
 app/controllers/wechat/board/organs_controller.rb |  2 +-
 app/models/wechat/app.rb                          |  1 -
 app/models/wechat/old_app.rb                      |  7 -------
 4 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 app/models/wechat/old_app.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index d0caf437..a36a7d93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/work-design/rails_auth.git
-  revision: 329d7cfd760e02c490103345e9482885d3bec5c4
+  revision: 32be35f88fca4f385d5b33da5feac739740ca257
   specs:
     rails_auth (1.2.0)
       bcrypt (~> 3.1)
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/work-design/rails_com.git
-  revision: b8854861b08d1f620597065944f406aa8dd8d384
+  revision: 1ca6050a4c30e53642ddcfd785055af5a8635490
   specs:
     rails_com (1.3.0)
       acme-client
@@ -25,14 +25,14 @@ GIT
 
 GIT
   remote: https://github.com/work-design/rails_design.git
-  revision: 45a4749982bd3713564f997716b9d9e2d2b11b29
+  revision: 4f946a9d39c79a1d00554a83333ffba3dd34e4ed
   specs:
     rails_design (0.0.1)
       rails
 
 GIT
   remote: https://github.com/work-design/rails_extend.git
-  revision: c0ae30365a524303d0a39be23fc31d675f2b827b
+  revision: 9ad17b86d6e4c9e12615c55cda98e8effd4b143a
   specs:
     rails_extend (1.0.1)
       rails (>= 5.0)
@@ -46,7 +46,7 @@ GIT
 
 GIT
   remote: https://github.com/work-design/rails_org.git
-  revision: b0371c7f7e12c9f1e4eec699cc87bb00eb3322b9
+  revision: 53284e6a0138f33aa2651637a7e09932879f875c
   specs:
     rails_org (0.0.1)
       rails_com (~> 1.2)
diff --git a/app/controllers/wechat/board/organs_controller.rb b/app/controllers/wechat/board/organs_controller.rb
index bfbdfaf8..7ce4559f 100644
--- a/app/controllers/wechat/board/organs_controller.rb
+++ b/app/controllers/wechat/board/organs_controller.rb
@@ -1,5 +1,5 @@
 module Wechat
-  class Board::OrgansController < Org::Board::OrgansController
+  class Board::OrgansController < defined?(RailsOrg) ? Org::Board::OrgansController : Board::BaseController
     before_action :set_organ, only: [:show, :edit, :update, :destroy]
     before_action :set_corp, only: [:new, :index]
     before_action :set_new_organ, only: [:new, :create]
diff --git a/app/models/wechat/app.rb b/app/models/wechat/app.rb
index 3996253d..e9750241 100644
--- a/app/models/wechat/app.rb
+++ b/app/models/wechat/app.rb
@@ -1,6 +1,5 @@
 module Wechat
   class App < ApplicationRecord
-    self.table_name = 'wechat_agencies'
     include Model::App
   end
 end
diff --git a/app/models/wechat/old_app.rb b/app/models/wechat/old_app.rb
deleted file mode 100644
index 0422dd74..00000000
--- a/app/models/wechat/old_app.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Wechat
-  class OldApp < ApplicationRecord
-    self.table_name = 'wechat_apps'
-    encrypts :secret
-
-  end
-end