feat：1. Okr 添加esc关闭窗口 2. Okr 页面返回错误修复 3. 修复安全漏洞-发送消息接口返回的响应数据，暴露了数据库信息

app/Models/AbstractModel.php

@@ -236,10 +236,10 @@ class AbstractModel extends Model
                 info($eb);
             }
             if ($e instanceof ApiException) {
-                throw new ApiException($e->getMessage(), $e->getData(), $e->getCode());
+                throw new ApiException( config('app.debug') ? $e->getMessage() : '处理错误', $e->getData(), $e->getCode());
             } else {
                 info($e);
-                throw new ApiException($e->getMessage() ?: '处理错误');
+                throw new ApiException( config('app.debug') ? ($e->getMessage() ?: '处理错误') : '处理错误');
             }
         }
     }

docker-compose.yml

@@ -176,7 +176,7 @@ services:
 
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.0.10"
+    image: "kuaifan/doookr:0.0.11"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"

resources/assets/js/app.js

@@ -143,6 +143,8 @@ Vue.prototype.goBack = function () {
         app.$store.state.routeHistorys.pop();
         const length = app.$store.state.routeHistorys.length;
         app.$store.state.routeHistoryLast = length >= 2 ? app.$store.state.routeHistorys[length - 2] : {};
+    } else if (app.$route.name == 'manage-apps') {
+        app.$router.back();
     } else {
         app.$router.replace({path: '/'}).catch(_ => {});
         app.$store.state.routeHistorys = [];

resources/assets/js/pages/manage/application.vue

@@ -25,13 +25,15 @@
                         >
                             <div class="apply-col">
                                 <div @click="applyClick(item)">
+                                    <div class="logo">
                                         <img :src="getLogoPath(item.value)" />
-                                    <p>{{ $L(item.label) }}</p>
                                         <div @click.stop="applyClick(item, 'badge')" class="apply-box-top-report">
                                             <Badge v-if="showBadge(item,'approve')" :overflow-count="999" :count="approveUnreadNumber" />
                                             <Badge v-if="showBadge(item,'report')" :overflow-count="999" :count="reportUnreadNumber" />
                                         </div>
                                     </div>
+                                    <p>{{ $L(item.label) }}</p>
+                                </div>
                             </div>
                         </Col>
                     </Row>

resources/assets/sass/pages/page-apply.scss

@@ -63,9 +63,14 @@
                     position: relative;
                     border: 1px solid #f1f1f1;
 
-                    >img {
+                    >.logo {
                         width: 40px;
                         height: 40px;
+                        display: inline-block;
+                        >img{
+                            width: 100%;
+                            height: 100%;
+                        }
                     }
                 
                     >p{
@@ -110,13 +115,19 @@
                         background: none;
                         border-color: #ffffff;
 
-                        >img {
+                        .logo {
-                            margin-bottom: 5px;
+                            margin-bottom: 8px;
+                            position: relative;
                         }
 
                         >p{
                             -webkit-line-clamp: 1;
                         }
+
+                        .apply-box-top-report {
+                            right: -20px;
+                            top: -20px;
+                        }
                     }
                 }
             }