Merge pull request #4 from Yeskn/dev

code improve

Author: Liu Jie

app/AppKernel.php

@@ -16,7 +16,7 @@ public function registerBundles()
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
-            new Yeskn\BlogBundle\YesknBlogBundle(),
+            new Yeskn\WebBundle\YesknWebBundle(),
             new Yeskn\AdminBundle\YesknAdminBundle(),
             new Yeskn\CommonBundle\YesknCommonBundle(),
             new Yeskn\UserBundle\YesknUserBundle(),

app/Resources/translations/messages.zh_CN.yml

@@ -52,4 +52,31 @@ name的回复: name的回复
 time 发表在: time 发表在
 name的关注: name的关注
 name的粉丝: name的粉丝
-发送成功: 发送成功
+发送成功: 发送成功
+赞: 赞
+好可怕，速度太快了: 好可怕，速度太快了
+板块: 板块
+查看所有私信: 查看所有私信
+个新的粉丝: 个新的粉丝
+查看所有通知: 查看所有通知
+我的主页: 我的主页
+个人设置: 个人设置
+全部: 全部
+热门: 热门
+福利: 福利
+追剧: 追剧
+插画: 插画
+游戏: 游戏
+站务公告: 站务公告
+漫展: 漫展
+Vmoex: Vmoex
+置顶: 置顶
+小黑屋: 小黑屋
+社区运行状态: 社区运行状态
+社区成立时间: 社区成立时间
+主题数量: 主题数量
+回复数量: 回复数量
+注册用户数量: 注册用户数量
+支持我们: 支持我们
+当前在线count人: 当前在线count人
+历史最高: 历史最高

app/config/config.yml

@@ -84,7 +84,7 @@ doctrine:
         naming_strategy: 'doctrine.orm.naming_strategy.underscore'
         auto_mapping: true
         mappings:
-            YesknBlogBundle: ~
+            YesknWebBundle: ~
 
 
 # Swiftmailer Configuration

app/config/routing.yml

@@ -9,7 +9,7 @@ vmoex_admin:
     prefix:   /
 
 vmoex_front:
-    resource: "@YesknBlogBundle/Controller/"
+    resource: "@YesknWebBundle/Controller/"
     type:     annotation
     prefix:   /
 

app/config/security.yml

@@ -2,14 +2,14 @@
 # http://symfony.com/doc/current/book/security.html
 security:
     encoders:
-        Yeskn\BlogBundle\Entity\User: bcrypt
+        Yeskn\WebBundle\Entity\User: bcrypt
         Symfony\Component\Security\Core\User\User: plaintext
 
     # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers
     providers:
         my_db_provider:
             entity:
-                class: YesknBlogBundle:User
+                class: YesknWebBundle:User
         in_memory:
             memory: ~
 

app/config/services.yml

@@ -19,25 +19,25 @@ services:
         tags:
             - { name: twig.extension }
 
-    Yeskn\BlogBundle\EventListener\RequestListener:
+    Yeskn\WebBundle\EventListener\RequestListener:
         tags:
             - { name: kernel.event_listener, event: kernel.request, priority: 50 }
 
-    Yeskn\BlogBundle\EventListener\ControllerListener:
+    Yeskn\WebBundle\EventListener\ControllerListener:
         arguments: ['@service_container']
         tags:
             - { name: kernel.event_listener, event: kernel.controller }
 
-    Yeskn\BlogBundle\EventListener\ResponseListener:
+    Yeskn\WebBundle\EventListener\ResponseListener:
         arguments: ~
         tags:
           - { name: kernel.event_listener, event: kernel.response }
 
     form.string2image.transformer:
-        class: Yeskn\BlogBundle\Form\DataTransformer\StringToImageTransformer
+        class: Yeskn\WebBundle\Form\DataTransformer\StringToImageTransformer
         arguments: ['@service_container']
 
-    Yeskn\BlogBundle\Form\TabType:
+    Yeskn\WebBundle\Form\TabType:
         arguments: ['@service_container', '@form.string2image.transformer']
         tags: [form.type]
 

bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "jet-blog",
+  "name": "vmoex",
   "dependencies": {
     "bootstrap": "v3.3.7",
     "flot":"v0.8.3",

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "jaggle/vmoex",
-    "license": "proprietary",
+    "license": "MIT",
     "description": "jaggle开发的二次元社区",
     "type": "project",
     "autoload": {
@@ -19,20 +19,21 @@
     },
     "require": {
         "php": ">=5.5.9",
+        "ext-json":"*",
         "symfony/symfony": "3.4.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "symfony/swiftmailer-bundle": "^2.3",
-        "symfony/monolog-bundle": "^2.8",
+        "symfony/monolog-bundle": "^3.3",
         "symfony/polyfill-apcu": "^1.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
         "symfony/assetic-bundle": "^2.8",
         "symfony/web-server-bundle": "^3.4",
         "yzalis/identicon": "^1.2",
-        "paquettg/php-html-parser": "^1.7",
+        "jaggle/php-html-parser": "^1.7",
         "predis/predis": "^1.1",
         "snc/redis-bundle": "^2.1",
         "workerman/phpsocket.io": "^1.1",