diff --git a/Client.html b/Client.html
deleted file mode 100644
index fbb7cec52..000000000
--- a/Client.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-Client
-
-
-
-
-
- è¿™æ˜¯ä¸€å¼ å›¾ç‰‡
- photo Share A
-
-
- 这是一段视频
- Text Share B
-
-
- 这是一篇文ç«
- Text Share C
-
-
-
-
-
\ No newline at end of file
diff --git a/Gemfile.lock~ b/Gemfile.lock~
deleted file mode 100644
index 7d6563465..000000000
--- a/Gemfile.lock~
+++ /dev/null
@@ -1,386 +0,0 @@
-GIT
- remote: http://github.com/guange2015/wechat.git
- revision: a18c3d6603cb1aa7bd1fe887b17f67426be01f35
- specs:
- wechat (0.7.1)
- activerecord (>= 3.2, < 5.1.x)
- http (~> 1.0, >= 1.0.1)
- nokogiri (>= 1.6.0)
- thor
-
-PATH
- remote: lib/gitlab-cli
- specs:
- gitlab (3.2.0)
- httparty
- terminal-table
-
-PATH
- remote: lib/grack
- specs:
- grack (2.0.2)
- rack (~> 1.4.5)
-
-PATH
- remote: lib/rails_kindeditor
- specs:
- rails_kindeditor (0.4.5)
- carrierwave
- mini_magick
-
-GEM
- remote: https://ruby.taobao.org/
- specs:
- actionmailer (3.2.22.2)
- actionpack (= 3.2.22.2)
- mail (~> 2.5.4)
- actionpack (3.2.22.2)
- activemodel (= 3.2.22.2)
- activesupport (= 3.2.22.2)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.5)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.2.1)
- activemodel (3.2.22.2)
- activesupport (= 3.2.22.2)
- builder (~> 3.0.0)
- activerecord (3.2.22.2)
- activemodel (= 3.2.22.2)
- activesupport (= 3.2.22.2)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.22.2)
- activemodel (= 3.2.22.2)
- activesupport (= 3.2.22.2)
- activesupport (3.2.22.2)
- i18n (~> 0.6, >= 0.6.4)
- multi_json (~> 1.0)
- acts-as-taggable-on (2.4.1)
- rails (>= 3, < 5)
- addressable (2.4.0)
- ansi (1.5.0)
- arel (3.0.3)
- axiom-types (0.1.1)
- descendants_tracker (~> 0.0.4)
- ice_nine (~> 0.11.0)
- thread_safe (~> 0.3, >= 0.3.1)
- better_errors (1.1.0)
- coderay (>= 1.0.0)
- erubis (>= 2.6.6)
- binding_of_caller (0.7.2)
- debug_inspector (>= 0.0.1)
- builder (3.0.0)
- byebug (8.2.2)
- carrierwave (0.10.0)
- activemodel (>= 3.2.0)
- activesupport (>= 3.2.0)
- json (>= 1.7)
- mime-types (>= 1.16)
- chinese_pinyin (1.0.0)
- climate_control (0.0.3)
- activesupport (>= 3.0)
- cocaine (0.5.8)
- climate_control (>= 0.0.3, < 1.0)
- coderay (1.1.1)
- coercible (1.0.0)
- descendants_tracker (~> 0.0.1)
- coffee-rails (3.2.2)
- coffee-script (>= 2.2.0)
- railties (~> 3.2.0)
- coffee-script (2.4.1)
- coffee-script-source
- execjs
- coffee-script-source (1.10.0)
- daemons (1.2.3)
- debug_inspector (0.0.2)
- delayed_job (4.1.1)
- activesupport (>= 3.0, < 5.0)
- delayed_job_active_record (4.1.0)
- activerecord (>= 3.0, < 5)
- delayed_job (>= 3.0, < 5)
- descendants_tracker (0.0.4)
- thread_safe (~> 0.3, >= 0.3.1)
- diff-lcs (1.2.5)
- domain_name (0.5.20160216)
- unf (>= 0.0.5, < 1.0.0)
- elasticsearch (1.0.15)
- elasticsearch-api (= 1.0.15)
- elasticsearch-transport (= 1.0.15)
- elasticsearch-api (1.0.15)
- multi_json
- elasticsearch-model (0.1.8)
- activesupport (> 3)
- elasticsearch (> 0.4)
- hashie
- elasticsearch-rails (0.1.8)
- elasticsearch-transport (1.0.15)
- faraday
- multi_json
- equalizer (0.0.11)
- erubis (2.7.0)
- execjs (2.6.0)
- factory_girl (4.5.0)
- activesupport (>= 3.0.0)
- factory_girl_rails (4.6.0)
- factory_girl (~> 4.5.0)
- railties (>= 3.0.0)
- faraday (0.9.2)
- multipart-post (>= 1.2, < 3)
- fastercsv (1.5.5)
- grape (0.9.0)
- activesupport
- builder
- hashie (>= 2.1.0)
- multi_json (>= 1.3.2)
- multi_xml (>= 0.5.2)
- rack (>= 1.3.0)
- rack-accept
- rack-mount
- virtus (>= 1.0.0)
- grape-entity (0.4.8)
- activesupport
- multi_json (>= 1.3.2)
- grape-swagger (0.10.4)
- grape (>= 0.8.0)
- grape-entity (< 0.5.0)
- hashie (3.4.3)
- hike (1.2.3)
- htmlentities (4.3.4)
- http (1.0.2)
- addressable (~> 2.3)
- http-cookie (~> 1.0)
- http-form_data (~> 1.0.1)
- http_parser.rb (~> 0.6.0)
- http-cookie (1.0.2)
- domain_name (~> 0.5)
- http-form_data (1.0.1)
- http_parser.rb (0.6.0)
- httparty (0.13.7)
- json (~> 1.8)
- multi_xml (>= 0.5.2)
- i18n (0.6.11)
- ice_nine (0.11.2)
- iconv (1.0.4)
- journey (1.0.4)
- jquery-rails (2.0.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.8.3)
- kaminari (0.16.3)
- actionpack (>= 3.0.0)
- activesupport (>= 3.0.0)
- libv8 (3.16.14.13)
- mail (2.5.4)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- method_source (0.8.2)
- mime-types (1.25.1)
- mini_magick (4.4.0)
- mini_portile2 (2.0.0)
- multi_json (1.11.2)
- multi_xml (0.5.5)
- multipart-post (2.0.0)
- mysql2 (0.3.18)
- net-ldap (0.3.1)
- netrc (0.11.0)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
- paperclip (3.5.4)
- activemodel (>= 3.0.0)
- activesupport (>= 3.0.0)
- cocaine (~> 0.5.3)
- mime-types
- polyglot (0.3.5)
- pry (0.10.3)
- coderay (~> 1.1.0)
- method_source (~> 0.8.1)
- slop (~> 3.4)
- pry-byebug (3.3.0)
- byebug (~> 8.0)
- pry (~> 0.10)
- pry-rails (0.3.4)
- pry (>= 0.9.10)
- pry-stack_explorer (0.4.9.2)
- binding_of_caller (>= 0.7)
- pry (>= 0.9.11)
- rack (1.4.7)
- rack-accept (0.4.5)
- rack (>= 0.4)
- rack-cache (1.6.1)
- rack (>= 0.4)
- rack-cors (0.4.0)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
- rack-openid (1.4.2)
- rack (>= 1.1.0)
- ruby-openid (>= 2.1.8)
- rack-raw-upload (1.1.1)
- multi_json
- rack-ssl (1.3.4)
- rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (3.2.22.2)
- actionmailer (= 3.2.22.2)
- actionpack (= 3.2.22.2)
- activerecord (= 3.2.22.2)
- activeresource (= 3.2.22.2)
- activesupport (= 3.2.22.2)
- bundler (~> 1.0)
- railties (= 3.2.22.2)
- railties (3.2.22.2)
- actionpack (= 3.2.22.2)
- activesupport (= 3.2.22.2)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
- rake (10.5.0)
- rdoc (3.12.2)
- json (~> 1.4)
- redis (3.2.2)
- redis-actionpack (3.2.4)
- actionpack (~> 3.2.0)
- redis-rack (~> 1.4.4)
- redis-store (~> 1.1.4)
- redis-activesupport (3.2.5)
- activesupport (~> 3.2.0)
- redis-store (~> 1.1.0)
- redis-rack (1.4.4)
- rack (~> 1.4.0)
- redis-store (~> 1.1.4)
- redis-rails (3.2.4)
- redis-actionpack (~> 3.2.4)
- redis-activesupport (~> 3.2.4)
- redis-store (~> 1.1.4)
- redis-store (1.1.7)
- redis (>= 2.2)
- ref (2.0.0)
- rest-client (1.8.0)
- http-cookie (>= 1.0.2, < 2.0)
- mime-types (>= 1.16, < 3.0)
- netrc (~> 0.7)
- rich (1.4.6)
- jquery-rails
- kaminari
- mime-types
- paperclip
- rack-raw-upload
- rails (>= 3.2.0)
- sass-rails
- rspec-core (3.4.3)
- rspec-support (~> 3.4.0)
- rspec-expectations (3.4.0)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-mocks (3.4.1)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-rails (3.4.2)
- actionpack (>= 3.0, < 4.3)
- activesupport (>= 3.0, < 4.3)
- railties (>= 3.0, < 4.3)
- rspec-core (~> 3.4.0)
- rspec-expectations (~> 3.4.0)
- rspec-mocks (~> 3.4.0)
- rspec-support (~> 3.4.0)
- rspec-support (3.4.1)
- ruby-ole (1.2.12)
- ruby-openid (2.1.8)
- rubyzip (1.2.0)
- sass (3.4.21)
- sass-rails (3.2.6)
- railties (~> 3.2.0)
- sass (>= 3.1.10)
- tilt (~> 1.3)
- seems_rateable (1.0.13)
- jquery-rails
- rails
- slop (3.6.0)
- spreadsheet (1.1.1)
- ruby-ole (>= 1.0)
- sprockets (2.2.3)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- terminal-table (1.5.2)
- therubyracer (0.12.2)
- libv8 (~> 3.16.14.0)
- ref
- thor (0.19.1)
- thread_safe (0.3.5)
- tilt (1.4.1)
- treetop (1.4.15)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.46)
- uglifier (2.7.2)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
- unf (0.1.4)
- unf_ext
- unf_ext (0.0.7.2)
- virtus (1.0.5)
- axiom-types (~> 0.1)
- coercible (~> 1.0)
- descendants_tracker (~> 0.0, >= 0.0.3)
- equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- acts-as-taggable-on (= 2.4.1)
- ansi
- better_errors (~> 1.1.0)
- binding_of_caller
- builder (= 3.0.0)
- chinese_pinyin
- coderay (~> 1.1.0)
- coffee-rails (~> 3.2.1)
- daemons
- delayed_job_active_record
- elasticsearch-model
- elasticsearch-rails
- factory_girl_rails
- fastercsv (~> 1.5.0)
- gitlab!
- grack!
- grape (~> 0.9.0)
- grape-entity
- grape-swagger
- htmlentities
- i18n (~> 0.6.0)
- iconv
- jquery-rails (~> 2.0.2)
- kaminari
- mysql2 (= 0.3.18)
- net-ldap (~> 0.3.1)
- paperclip (~> 3.5.4)
- pry-byebug
- pry-rails
- pry-stack_explorer
- rack-cors
- rack-openid
- rails (~> 3.2)
- rails_kindeditor!
- redis-rails
- rest-client
- rich (= 1.4.6)
- rspec-rails (~> 3.0)
- ruby-ole
- ruby-openid (~> 2.1.4)
- rubyzip
- sass-rails (~> 3.2.3)
- seems_rateable (~> 1.0.13)
- spreadsheet
- therubyracer
- uglifier (>= 1.0.3)
- wechat!
-
-BUNDLED WITH
- 1.10.6
diff --git a/Gemfile~ b/Gemfile~
deleted file mode 100644
index 24869e72b..000000000
--- a/Gemfile~
+++ /dev/null
@@ -1,112 +0,0 @@
-source 'http://rubygems.org/'
-### ÕâÀïÖ´ÐÐbundle config mirror.https://rubygems.org https://gems.ruby-china.org Çл»µ½ruby-chinaÔ´
-
-unless RUBY_PLATFORM =~ /w32/
- # unix-like only
- gem 'iconv'
-end
-
-gem 'certified'
-
-gem 'wechat',path: 'lib/wechat'
-gem 'grack', path:'lib/grack'
-gem 'gitlab', path: 'lib/gitlab-cli'
-gem 'rest-client'
-gem "mysql2", "= 0.3.18"
-gem 'redis-rails'
-gem 'rubyzip'
-gem 'delayed_job_active_record'#, :group => :production
-gem 'daemons'
-gem 'grape', '~> 0.9.0'
-gem 'grape-entity'
-gem 'rack-cors', :require => 'rack/cors'
-gem 'seems_rateable', '~> 1.0.13'
-gem 'rails', '~> 3.2'
-gem "jquery-rails", "~> 2.0.2"
-gem "i18n", "~> 0.6.0"
-gem 'coderay', '~> 1.1.0'
-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
-gem "builder", "3.0.0"
-gem 'acts-as-taggable-on', '2.4.1'
-gem 'spreadsheet'
-gem 'ruby-ole'
-gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-#gem "rmagick", ">= 2.0.0"
-gem 'binding_of_caller'
-gem 'chinese_pinyin'
-# gem 'sunspot_rails', '~> 1.3.3'
-# gem 'sunspot_solr'
-# gem 'sunspot'
-# gem 'progress_bar'
-gem 'ansi'
-
-gem 'kaminari'
-gem 'elasticsearch-model'
-gem 'elasticsearch-rails'
-
-
-### profile
-#gem 'oneapm_rpm'
-
-group :development do
- gem 'grape-swagger'
- gem 'better_errors', '~> 1.1.0'
- # gem "query_reviewer"
- # gem 'rack-mini-profiler', '~> 0.9.3'
- if RUBY_PLATFORM =~ /w32/
- gem 'win32console'
- end
-end
-
-group :development, :test do
- unless RUBY_PLATFORM =~ /w32/
- gem 'pry-rails'
- if RUBY_VERSION >= '2.0.0'
- gem 'pry-byebug'
- end
- gem 'pry-stack_explorer'
- if RUBY_PLATFORM =~ /darwin/
- gem 'puma'
- end
- end
-
- gem 'rspec-rails', '~> 3.0'
- gem 'factory_girl_rails'
-end
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
- gem 'sass-rails', '~> 3.2.3'
- gem 'coffee-rails', '~> 3.2.1'
-
- # See https://github.com/sstephenson/execjs#readme for more supported runtimes
- gem 'therubyracer', :platforms => :ruby
-
- gem 'uglifier', '>= 1.0.3'
-end
-
-# Optional gem for LDAP authentication
-group :ldap do
- gem "net-ldap", "~> 0.3.1"
-end
-
-
-# Optional gem for OpenID authentication
-group :openid do
- gem "ruby-openid", "~> 2.1.4", :require => "openid"
- gem "rack-openid"
-end
-
-
-database_file = File.join(File.dirname(__FILE__), "config/database.yml")
-if File.exist?(database_file)
-else
- warn("Please configure your config/database.yml first")
-end
-
-# Load plugins' Gemfiles
-Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
- puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
- instance_eval File.read(file)
-end