FIX 解决featrue_homepage分支代码冲突

app/libs/custom_regexp.rb

@@ -1,6 +1,7 @@
 module CustomRegexp
   PHONE = /1\d{10}/
   EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
+  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
   LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
   NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
   PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/

app/libs/forum.rb

@@ -0,0 +1,20 @@
+module Forum
+  class << self
+    def forum_config
+      forum_config = {}
+
+      begin
+        config = Rails.application.config_for(:configuration).symbolize_keys!
+        forum_config = config[:forum].symbolize_keys!
+        raise 'forum config missing' if forum_config.blank?
+      rescue => ex
+        raise ex if Rails.env.production?
+
+        puts %Q{\033[33m [warning] forum config or configuration.yml missing,
+                 please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+        forum_config = {}
+      end
+      forum_config
+    end
+  end
+end