清理无用文件

README.md

@@ -38,7 +38,7 @@ PS：**系统后台已禁止提交并隐藏私人配置**
 #### 会推出商业服务吗？
 
 - 如果不符合您对“开源”的认知，请移步其它同类产品，毕竟同类“免费”产品也很多。
-- 如果“开源”版本不能满足您的需求，或者您更希望有更好的支持，商业服务是不错的选择。
+- 如果“开源”版本不能满足您的需求，或者您希望有更好的支持，商业服务是不错的选择。
 
 我们为用户提供的服务包括：
 
@@ -57,7 +57,7 @@ PS：**系统后台已禁止提交并隐藏私人配置**
 #### 通过这个项目能学到什么？
 
 1. 项目规划，phalcon实战，缓存，JWT，即时通讯，全文检索
-2. docker操作，docker服务编排，supervisor，devOps
+2. docker操作，docker服务编排，supervisor，devops
 3. git，linux，php，mysql，redis，nginx
 
 #### 开发计划

app/Http/Admin/Views/setting/live_pull.volt

@@ -53,43 +53,44 @@
         </div>
     </div>
     <div id="ptt-block" {{ ppt_display }}>
-        <table class="layui-table kg-table layui-form">
+        <div class="layui-form-item">
-            <colgroup>
+            <table class="layui-table">
-                <col>
+                <colgroup>
-                <col>
+                    <col>
-                <col>
+                    <col>
-                <col>
+                    <col>
-            </colgroup>
+                    <col>
-            <thead>
+                </colgroup>
-            <tr>
+                <thead>
-                <th>模板名称</th>
+                <tr>
-                <th>模板描述</th>
+                    <th>模板名称</th>
-                <th>视频码率（kbps）</th>
+                    <th>模板描述</th>
-                <th>视频高度（px）</th>
+                    <th>视频码率（kbps）</th>
-            </tr>
+                    <th>视频高度（px）</th>
-            </thead>
+                </tr>
-            <tbody>
+                </thead>
-            <tr>
+                <tbody>
-                <td>fd</td>
+                <tr>
-                <td>流畅</td>
+                    <td>fd</td>
-                <td>500</td>
+                    <td>流畅</td>
-                <td>540</td>
+                    <td>500</td>
-            </tr>
+                    <td>540</td>
-            <tr>
+                </tr>
-                <td>sd</td>
+                <tr>
-                <td>标清</td>
+                    <td>sd</td>
-                <td>1000</td>
+                    <td>标清</td>
-                <td>720</td>
+                    <td>1000</td>
-            </tr>
+                    <td>720</td>
-            <tr>
+                </tr>
-                <td>hd</td>
+                <tr>
-                <td>高清</td>
+                    <td>hd</td>
-                <td>2000</td>
+                    <td>高清</td>
-                <td>1080</td>
+                    <td>2000</td>
-            </tr>
+                    <td>1080</td>
-            </tbody>
+                </tr>
-        </table>
+                </tbody>
-        <br>
+            </table>
+        </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label"></label>

app/Http/Admin/Views/setting/storage.volt

@@ -32,20 +32,35 @@
             </div>
         </div>
         <fieldset class="layui-elem-field layui-field-title">
-            <legend>数据万象</legend>
+            <legend>图片处理样式</legend>
         </fieldset>
         <div class="layui-form-item">
-            <label class="layui-form-label">访问协议</label>
+            <table class="layui-table" lay-size="lg">
-            <div class="layui-input-block">
+                <colgroup>
-                <input type="radio" name="ci_protocol" value="http" title="HTTP" {% if storage.ci_protocol == "http" %}checked{% endif %}>
+                    <col>
-                <input type="radio" name="ci_protocol" value="https" title="HTTPS" {% if storage.ci_protocol == "https" %}checked{% endif %}>
+                    <col>
-            </div>
+                </colgroup>
-        </div>
+                <thead>
-        <div class="layui-form-item">
+                <tr>
-            <label class="layui-form-label">访问域名</label>
+                    <th>样式名称</th>
-            <div class="layui-input-block">
+                    <th>样式描述</th>
-                <input class="layui-input" type="text" name="ci_domain" value="{{ storage.ci_domain }}" lay-verify="required">
+                </tr>
-            </div>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>avatar_160</td>
+                    <td>imageMogr2/thumbnail/160x/interlace/0</td>
+                </tr>
+                <tr>
+                    <td>cover_270</td>
+                    <td>mageMogr2/thumbnail/270x/interlace/0</td>
+                </tr>
+                <tr>
+                    <td>carousel_1100</td>
+                    <td>imageMogr2/thumbnail/1100x/interlace/0</td>
+                </tr>
+                </tbody>
+            </table>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label"></label>

app/Http/Desktop/Views/course/list_filter.volt

@@ -1,3 +1,9 @@
+{% set tc_val = request.get('tc','int','all') %}
+{% set sc_val = request.get('sc','int','all') %}
+{% set model_val = request.get('model','trim','all') %}
+{% set level_val = request.get('level','trim','all') %}
+{% set sort_val = request.get('sort','trim','score') %}
+
 <div class="filter-toggle">
     <span class="layui-icon layui-icon-up"></span>
 </div>
@@ -6,7 +12,6 @@
     <div class="filter-group">
         <div class="title">方向</div>
         <div class="content">
-            {% set tc_val = request.get('tc','int','all') %}
             {% for category in top_categories %}
                 {% set class = tc_val == category.id ? 'layui-btn layui-btn-xs' : 'none' %}
                 <a class="{{ class }}" href="{{ category.url }}">{{ category.name }}</a>
@@ -17,7 +22,6 @@
         <div class="filter-group">
             <div class="title">分类</div>
             <div class="content">
-                {% set sc_val = request.get('sc','int','all') %}
                 {% for category in sub_categories %}
                     {% set class = sc_val == category.id ? 'layui-btn layui-btn-xs' : 'none' %}
                     <a class="{{ class }}" href="{{ category.url }}">{{ category.name }}</a>
@@ -28,7 +32,6 @@
     <div class="filter-group">
         <div class="title">类型</div>
         <div class="content">
-            {% set model_val = request.get('model','trim','all') %}
             {% for model in models %}
                 {% set class = model_val == model.id ? 'layui-btn layui-btn-xs' : 'none' %}
                 <a class="{{ class }}" href="{{ model.url }}">{{ model.name }}</a>
@@ -38,7 +41,6 @@
     <div class="filter-group">
         <div class="title">难度</div>
         <div class="content">
-            {% set level_val = request.get('level','trim','all') %}
             {% for level in levels %}
                 {% set class = level_val == level.id ? 'layui-btn layui-btn-xs' : 'none' %}
                 <a class="{{ class }}" href="{{ level.url }}">{{ level.name }}</a>
@@ -48,7 +50,6 @@
 </div>
 
 <div class="course-sort wrap">
-    {% set sort_val = request.get('sort','trim','score') %}
     {% for sort in sorts %}
         {% set class = sort_val == sort.id ? 'layui-btn layui-btn-xs' : 'none' %}
         <a class="{{ class }}" href="{{ sort.url }}">{{ sort.name }}</a>

app/Http/Desktop/Views/course/show_meta.volt

@@ -33,24 +33,24 @@
         <p class="item">
             <span class="key">难度级别</span><span class="value">{{ level_info(course.level) }}</span>
             <span class="key">学习人次</span><span class="value">{{ course.user_count }}</span>
-            <span class="key">综合评分</span><span class="value">{{ course.ratings.rating }}</span>
+            <span class="key">综合评分</span><span class="value">{{ "%0.1f"|format(course.ratings.rating) }}</span>
         </p>
     </div>
     <div class="rating">
         <p class="item">
             <span class="name">内容实用</span>
             <span class="star">{{ star_info(course.ratings.rating1) }}</span>
-            <span class="score">{{ course.ratings.rating1 }}分</span>
+            <span class="score">{{ "%0.1f"|format(course.ratings.rating1) }}分</span>
         </p>
         <p class="item">
             <span class="name">简洁易懂</span>
             <span class="star">{{ star_info(course.ratings.rating2) }}</span>
-            <span class="score">{{ course.ratings.rating2 }}分</span>
+            <span class="score">{{ "%0.1f"|format(course.ratings.rating2) }}分</span>
         </p>
         <p class="item">
             <span class="name">逻辑清晰</span>
             <span class="star">{{ star_info(course.ratings.rating3) }}</span>
-            <span class="score">{{ course.ratings.rating3 }}分</span>
+            <span class="score">{{ "%0.1f"|format(course.ratings.rating3) }}分</span>
         </p>
     </div>
 </div>

app/Http/Desktop/Views/macros/consult.volt

@@ -0,0 +1,9 @@
+{%- macro priority_info(value) %}
+    {% if value == 10 %}
+        <span class="layui-badge layui-bg-red">高</span>
+    {% elseif value == 20 %}
+        <span class="layui-badge layui-bg-blue">中</span>
+    {% elseif value == 30 %}
+        <span class="layui-badge layui-bg-gray">低</span>
+    {% endif %}
+{%- endmacro %}

app/Http/Desktop/Views/macros/group.volt

@@ -1,9 +1,9 @@
 {%- macro type_info(value) %}
-    {% if value == '1' %}
+    {% if value == 1 %}
         <span class="layui-badge layui-bg-green type" title="课程交流">课</span>
-    {% elseif value == '2' %}
+    {% elseif value == 2 %}
         <span class="layui-badge layui-bg-blue type" title="课外畅聊">聊</span>
-    {% elseif value == '3' %}
+    {% elseif value == 3 %}
         <span class="layui-badge layui-bg-cyan type" title="职工交流">职</span>
     {% endif %}
 {%- endmacro %}

app/Http/Desktop/Views/my/consults.volt

@@ -33,8 +33,8 @@
                             {% set delete_url = url({'for':'desktop.consult.delete','id':item.id}) %}
                             <tr>
                                 <td>
-                                    <p class="layui-elip item-elip" title="{{ item.question }}">提问：{{ item.question }}</p>
+                                    <p class="content layui-elip" title="{{ item.question }}">提问：{{ item.question }}</p>
-                                    <p class="layui-elip item-elip" title="{{ item.answer }}">回复：{{ item.answer }}</p>
+                                    <p class="content layui-elip" title="{{ item.answer }}">回复：{{ item.answer }}</p>
                                 </td>
                                 <td>{{ date('Y-m-d',item.create_time) }}</td>
                                 <td>

app/Http/Desktop/Views/my/favorites.volt

@@ -37,7 +37,7 @@
                                 <td><a href="{{ course_url }}">{{ item.title }}</a> {{ model_info(item.model) }}</td>
                                 <td>{{ item.user_count }}</td>
                                 <td>{{ item.favorite_count }}</td>
-                                <td>{{ item.rating }}</td>
+                                <td>{{ "%0.1f"|format(item.rating) }}</td>
                                 <td class="center">
                                     <button class="layui-btn layui-btn-sm kg-delete" data-tips="确定要取消收藏吗？" data-url="{{ favorite_url }}">取消</button>
                                 </td>

app/Http/Desktop/Views/my/friends.volt

@@ -44,7 +44,7 @@
                             <tr>
                                 <td><a href="{{ user_url }}" title="{{ item.about }}">{{ item.name }}</a></td>
                                 <td>{{ gender_info(item.gender) }}</td>
-                                <td>{{ item.location }}</td>
+                                <td>{{ item.area }}</td>
                                 <td>{{ item.active_time|time_ago }}</td>
                                 <td>
                                     <button class="layui-btn layui-btn-sm kg-delete" data-url="{{ delete_url }}">删除</button>

app/Http/Desktop/Views/my/groups.volt

@@ -2,13 +2,7 @@
 
 {% block content %}
 
-    {%- macro type_info(value) %}
+    {{ partial('macros/group') }}
-        {% if value == 'course' %}
-            <span class="layui-badge layui-bg-green">课</span>
-        {% elseif value == 'chat' %}
-            <span class="layui-badge layui-bg-blue">聊</span>
-        {% endif %}
-    {%- endmacro %}
 
     {% set joined_url = url({'for':'desktop.my.groups'},{'type':'joined'}) %}
     {% set owned_url = url({'for':'desktop.my.groups'},{'type':'owned'}) %}

app/Http/Desktop/Views/my/groups_joined.volt

@@ -16,10 +16,11 @@
         </thead>
         <tbody>
         {% for item in pager.items %}
+            {% set show_url = url({'for':'desktop.group.show','id':item.id}) %}
             {% set owner_url = url({'for':'desktop.user.show','id':item.owner.id}) %}
             {% set delete_url = url({'for':'desktop.im.quit_group','id':item.id}) %}
             <tr>
-                <td><span title="{{ item.about }}">{{ item.name }}</span> {{ type_info(item.type) }}</td>
+                <td><a href="{{ show_url }}" title="{{ item.about }}">{{ item.name }}</a> {{ type_info(item.type) }}</td>
                 <td><a href="{{ owner_url }}">{{ item.owner.name }}</a></td>
                 <td>{{ item.user_count }}</td>
                 <td>

app/Http/Desktop/Views/my/reviews.volt

@@ -36,9 +36,9 @@
                                     <p class="content layui-elip" title="{{ item.content }}">评价：{{ item.content }}</p>
                                 </td>
                                 <td>
-                                    <p class="rating">内容实用：{{ item.rating1 }}</p>
+                                    <p class="rating">内容实用：{{ "%0.1f"|format(item.rating1) }}</p>
-                                    <p class="rating">通俗易懂：{{ item.rating2 }}</p>
+                                    <p class="rating">通俗易懂：{{ "%0.1f"|format(item.rating2) }}</p>
-                                    <p class="rating">逻辑清晰：{{ item.rating3 }}</p>
+                                    <p class="rating">逻辑清晰：{{ "%0.1f"|format(item.rating3) }}</p>
                                 </td>
                                 <td>
                                     <button class="layui-btn layui-btn-xs btn-edit-review" data-url="{{ edit_url }}">修改</button>

app/Http/Desktop/Views/teaching/consults.volt

@@ -2,6 +2,8 @@
 
 {% block content %}
 
+    {{ partial('macros/consult') }}
+
     {% set status_types = {'all':'全部','pending':'待回复','replied':'已回复'} %}
     {% set status = request.get('status','trim','all') %}
 
@@ -45,7 +47,7 @@
                                     <p class="content layui-elip" title="{{ item.question }}">提问：{{ item.question }}</p>
                                     <p class="content layui-elip" title="{{ item.answer }}">回复：{{ answer }}</p>
                                 </td>
-                                <td>{{ item.priority }}</td>
+                                <td>{{ priority_info(item.priority) }}</td>
                                 <td>{{ date('Y-m-d',item.create_time) }}</td>
                                 <td>
                                     <button class="layui-btn layui-btn-xs layui-bg-green btn-show-consult" data-url="{{ show_url }}">详情</button>

app/Http/Desktop/Views/teaching/courses.volt

@@ -37,7 +37,7 @@
                                 <td>{{ item.lesson_count }}</td>
                                 <td>{{ item.user_count }}</td>
                                 <td>{{ item.favorite_count }}</td>
-                                <td>{{ item.rating }}</td>
+                                <td>{{ "%0.1f"|format(item.rating) }}</td>
                             </tr>
                         {% endfor %}
                         </tbody>

app/Models/Consult.php

@@ -56,6 +56,13 @@ class Consult extends Model
      */
     public $answer;
 
+    /**
+     * 评分
+     *
+     * @var int
+     */
+    public $rating;
+
     /**
      * 优先级
      *

app/Services/Frontend/Consult/ConsultInfo.php

@@ -27,8 +27,8 @@ class ConsultInfo extends FrontendService
             'id' => $consult->id,
             'question' => $consult->question,
             'answer' => $consult->answer,
-            'private' => $consult->private,
             'rating' => $consult->rating,
+            'private' => $consult->private,
             'like_count' => $consult->like_count,
             'create_time' => $consult->create_time,
             'update_time' => $consult->update_time,

db/migrations/20200827112717_insert_setting_data.php

@@ -82,52 +82,52 @@ final class InsertSettingData extends AbstractMigration
             ],
             [
                 'section' => 'live.push',
-                'item_key' => 'push_auth_enabled',
+                'item_key' => 'auth_enabled',
                 'item_value' => '1',
             ],
             [
                 'section' => 'live.push',
-                'item_key' => 'push_auth_key',
+                'item_key' => 'auth_key',
                 'item_value' => '',
             ],
             [
                 'section' => 'live.push',
-                'item_key' => 'push_auth_delta',
+                'item_key' => 'auth_delta',
                 'item_value' => '18000',
             ],
             [
                 'section' => 'live.pull',
-                'item_key' => 'pull_protocol',
+                'item_key' => 'protocol',
                 'item_value' => 'http',
             ],
             [
                 'section' => 'live.pull',
-                'item_key' => 'pull_domain',
+                'item_key' => 'domain',
                 'item_value' => '',
             ],
             [
                 'section' => 'live.pull',
-                'item_key' => 'pull_trans_enabled',
+                'item_key' => 'trans_enabled',
                 'item_value' => '0',
             ],
             [
                 'section' => 'live.pull',
-                'item_key' => 'pull_auth_enabled',
+                'item_key' => 'auth_enabled',
                 'item_value' => '1',
             ],
             [
                 'section' => 'live.pull',
-                'item_key' => 'pull_auth_key',
+                'item_key' => 'auth_key',
                 'item_value' => '',
             ],
             [
                 'section' => 'live.pull',
-                'item_key' => 'pull_auth_delta',
+                'item_key' => 'auth_delta',
                 'item_value' => '18000',
             ],
             [
                 'section' => 'live.notify',
-                'item_key' => 'pull_auth_key',
+                'item_key' => 'auth_key',
                 'item_value' => '',
             ],
             [

public/static/desktop/css/common.css

@@ -73,6 +73,7 @@
 }
 
 .pager {
+    margin-top: 20px;
     text-align: center;
 }