优化：更新注释

Author: modstart

module/AigcBase/Docs/release.md

@@ -1,3 +1,9 @@
+## 1.3.1 非Markdown格式模型调用异常问题
+
+- 修复：非Markdown格式模型调用异常问题
+
+---
+
 ## 1.3.0 系统重构，支持多个AI服务商，支持自定义AI服务商
 
 - 系统重构，支持多个AI服务商，支持自定义AI服务商

module/AigcBase/Provider/AbstractAigcChatProvider.php

@@ -46,7 +46,7 @@ protected function chatGetContentOrFail($sessionId, $msg, $option)
 
     protected function chatResponse($sessionId, $content, $option)
     {
-        if (!$option['markdown']) {
+        if (empty($option['markdown'])) {
             $content = MarkdownUtil::convertToHtml($content);
         }
         return Response::generateSuccessData([

module/AigcBase/Util/AigcCreditUtil.php

@@ -13,9 +13,7 @@ public static function calc($configKeyPrefix, $countCalculator)
         $unit = modstart_config($configKeyPrefix . 'Unit', 1);
         $cost = modstart_config($configKeyPrefix . 'Cost', 1);
         if (is_callable($countCalculator)) {
-            $count = call_user_func_array($countCalculator, [
-                $unit
-            ]);
+            $count = call_user_func_array($countCalculator, []);
         } else {
             $count = $countCalculator;
         }

module/AigcBase/config.json

@@ -17,7 +17,7 @@
         "AigcChatOpenAi",
         "AigcChatZhipuAi"
     ],
-    "version": "1.3.0",
+    "version": "1.3.1",
     "modstartVersion": ">=4.1.0",
     "author": "ModStart",
     "description": "提供AI基础框架包，支持各种模型接入",

module/Blog/Admin/Controller/ConfigController.php

@@ -48,6 +48,8 @@ public function index(AdminConfigBuilder $builder)
             $builder->select('Blog_BlogSuperSearchProvider', '博客超级搜索驱动')->options(SuperSearchProvider::allDefaultMap());
             $builder->switch('Blog_CommentEnable', '启用评论');
             $builder->switch('Blog_ContentNavEnable', '启用内容导航');
+            $builder->switch('Blog_CommentVerifyEnable', '博客评论审核');
+            $builder->switch('Blog_MessageVerifyEnable', '留言审核');
         });
         $builder->layoutPanel('安全设置', function (Form $builder) {
             $builder->select('Blog_BlogCaptchaProvider', '博客评论验证')->options(CaptchaProvider::nameTitleMap());

module/Blog/Api/Controller/CommentController.php

@@ -53,7 +53,11 @@ public function add()
         } else {
             $data['memberUserId'] = 0;
         }
-        $data['status'] = BlogCommentStatus::WAIT_VERIFY;
+        if (modstart_config('Blog_CommentVerifyEnable', false)) {
+            $data['status'] = BlogCommentStatus::WAIT_VERIFY;
+        } else {
+            $data['status'] = BlogCommentStatus::VERIFY_SUCCESS;
+        }
         ModelUtil::insert('blog_comment', $data);
         ModelUtil::update('blog', $blogId, [
             'commentCount' => ModelUtil::count('blog_comment', [

module/Blog/Api/Controller/MessageController.php

@@ -88,7 +88,11 @@ public function add()
         } else {
             $data['memberUserId'] = 0;
         }
-        $data['status'] = BlogCommentStatus::WAIT_VERIFY;
+        if (modstart_config('Blog_MessageVerifyEnable', false)) {
+            $data['status'] = BlogCommentStatus::WAIT_VERIFY;
+        } else {
+            $data['status'] = BlogCommentStatus::VERIFY_SUCCESS;
+        }
         ModelUtil::insert('blog_message', $data);
         return Response::generate(0, '提交成功，后台审核后将会显示', null, '[reload]');
     }

module/Blog/Docs/release.md

@@ -1,3 +1,11 @@
+## 3.8.0 博客评论和留言免审核开关，升级基础依赖
+
+- 新增：升级基础依赖
+- 新增：博客评论免审核开关
+- 新增：博客留言免审核开关
+
+---
+
 ## 3.7.0 博客批量导入支持
 
 - 新增：博客批量导入支持

module/Blog/config.json

@@ -17,8 +17,8 @@
     "tags": [
         "博客"
     ],
-    "modstartVersion": ">=4.0.0",
-    "version": "3.7.0",
+    "modstartVersion": ">=4.1.0",
+    "version": "3.8.0",
     "author": "ModStart",
     "description": "提供一个基础的博客系统",
     "suggest": [
@@ -33,4 +33,4 @@
         "TagManager"
     ],
     "config": {}
-}
+}

module/ModuleStore/Asset/entry/moduleStore.js

@@ -1,3 +1,10 @@
+## 2.2.0 模块市场登录安全升级
+
+- 新增：模块市场登录安全升级
+- 优化：管理界面优化
+
+---
+
 ## 2.1.0 功能特性优化，已知问题修复
 
 - 新增：模块一键扫码购买功能

module/ModuleStore/Docs/release.md

@@ -15,8 +15,9 @@
     "require": [
         "Vendor:>=1.4.0"
     ],
-    "modstartVersion": ">=3.7.0",
-    "version": "2.1.0",
+    "modstartVersion": ">=4.1.0",
+    "version": "2.2.0",
     "author": "官方",
-    "description": "提供各种各样的应用模块，方便应用快速集成"
+    "description": "提供各种各样的应用模块，方便应用快速集成",
+    "config": {}
 }

module/ModuleStore/config.json

@@ -49,7 +49,7 @@
             </el-tabs>
             <a href="javascript:;" @click="search.tab='system'"
                class="ub-text-muted tw-leading-10 tw-px-3 tw-absolute tw-right-0 tw-top-0">
-                <i class="iconfont icon-cog"></i> 系统模块
+                <i class="iconfont icon-cog"></i> 内置模块
             </a>
             <div class="ub-padding">
                 <div class="tw-float-right">
@@ -120,11 +120,11 @@
                 </div>
                 <div class="text">暂无记录</div>
             </div>
-            <div class="ub-padding" v-if="filterModules.length>0">
+            <div class="margin-top tw-p-3" v-if="filterModules.length>0">
                 <div class="row">
                     <div v-for="(module,moduleIndex) in filterModules" class="col-md-4">
                         <div
-                            class="tw-bg-white tw-p-2 tw-rounded tw-mb-2 tw-border-gray-200 tw-border-solid tw-border tw-shadow">
+                            class="hover:tw-shadow-lg tw-bg-white tw-mb-2 tw-p-2 tw-rounded-lg tw-shadow ub-border">
                             <div style="padding-left:6rem;">
                                 <div class="tw-w-28 tw-float-left" style="margin-left:-6rem;">
                                     <a v-if="module.url"
@@ -253,28 +253,26 @@
                 </a>
             </div>
             <div v-if="!memberUser.id">
-                <div style="padding:0 1.5rem;">
-                    <div class="tw-py-2 tw-text-center tw-text-lg">
-                        请登录账号
+                <div style="padding:1.5rem;">
+                    <div class="margin-bottom tw-font-bold">
+                        <i class="iconfont icon-code-alt"></i>
+                        任意搭配市场的模块，让系统百变
                     </div>
                     <div class="ub-form vertical">
-                        <div class="line">
-                            <div class="label">用户名</div>
+                        <div class="line margin-bottom">
                             <div class="field">
                                 <input type="text" class="form" v-model="memberLoginInfo.username"
                                        @keyup="doSubmitCheck" placeholder="输入用户名"/>
                             </div>
                         </div>
-                        <div class="line">
-                            <div class="label">密码</div>
+                        <div class="line margin-bottom">
                             <div class="field">
                                 <input type="password" class="form" v-model="memberLoginInfo.password"
                                        @keyup="doSubmitCheck"
                                        placeholder="输入密码"/>
                             </div>
                         </div>
-                        <div class="line">
-                            <div class="label">验证码</div>
+                        <div class="line margin-bottom">
                             <div class="field">
                                 <div class="row no-gutters">
                                     <div class="col-8">
@@ -293,14 +291,15 @@
                             <div class="field">
                                 <el-checkbox v-model="memberLoginInfo.agree">
                                     同意
-                                    <a target="_blank" href="https://modstart.com/article/module_agreement">《使用协议》</a>
+                                    <a target="_blank"
+                                       href="https://modstart.com/article/module_agreement">《使用协议》</a>
                                     <a target="_blank" href="https://modstart.com/article/disclaimer">《免责声明》</a>
                                 </el-checkbox>
                             </div>
                         </div>
                         <div class="line">
                             <div class="field">
-                                <button type="submit" class="btn btn-primary btn-block" @click="doMemberLoginSubmit()">
+                                <button type="submit" class="btn btn-primary btn-block btn-round" @click="doMemberLoginSubmit()">
                                     登录
                                 </button>
                             </div>
@@ -618,8 +617,16 @@ export default {
                 this.$dialog.tipError('请先同意使用协议')
                 return
             }
+            const postData = {
+                username: this.memberLoginInfo.username,
+                password: this.memberLoginInfo.password,
+                captcha: this.memberLoginInfo.captcha,
+            }
+            postData.ek = MS.util.randomString(8)
+            postData.username = 'E.A:' + MS.util.encrypt.aesEncode(postData.ek, postData.username)
+            postData.password = 'E.A:' + MS.util.encrypt.aesEncode(postData.ek, postData.password)
             this.$dialog.loadingOn()
-            this.doStoreRequest('store/login', this.memberLoginInfo, res => {
+            this.doStoreRequest('store/login', postData, res => {
                 this.$dialog.loadingOff()
                 this.$dialog.tipSuccess('登录成功')
                 this.doLoadStoreMember()

module/ModuleStore/resources/asset/src/pages/ModuleStore.vue

@@ -36,7 +36,7 @@
     position: relative;
     box-sizing: border-box;
     margin: 2.5rem auto;
-    padding: 0.5rem;
+    padding: 0;
     width: 30rem;
     max-width: 100%;
     max-width: calc(100% - 1rem);
@@ -46,7 +46,7 @@
     transform: translateY(-100px);
     -webkit-transition: opacity 0.3s linear, -webkit-transform 0.3s ease-in-out;
     transition: opacity 0.3s linear, transform 0.3s ease-in-out;
-    border-radius: 3px;
+    border-radius: 0.5rem;
     box-shadow: 0 0 0.5rem rgba(0, 0, 0, 0.3);
 }
 
@@ -66,27 +66,35 @@
 }
 
 .ub-modal-dialog > .ub-modal-close {
-    margin: -0rem -0rem 0 0;
-    float: right;
-    color: #c4cfdb;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
+    font-size: 0.7rem;
+    color: var(--color-tertiary);
+    line-height: 1.5rem;
 
     &:hover {
-        color: var(--color-primary);
+        color: var(--color-danger);
     }
 }
 
 .ub-modal-dialog {
     & > .ub-modal-head {
         border-bottom: 1px solid #EEE;
-        padding: 0 0 0.5rem 0;
+        padding: 0.5rem;
+
+        & > .title {
+            line-height: 1.5rem;
+            height: 1.5rem;
+        }
     }
 
     & > .ub-modal-body {
-        padding: 0.5rem 0;
+        padding: 0.5rem;
     }
 
     & > .ub-modal-foot {
-        padding: 0.5rem 0 0 0;
+        padding: 0.5rem;
         text-align: right;
         border-top: 1px solid #EEE;
     }

public/asset/theme/default/style.css

@@ -6,64 +6,64 @@
     <a v-if="playing" class="pause" href="javascript:;" @click="playing=false">
       <i class="iconfont">&#xe6a3;</i>
     </a>
-    <audio ref="audio" :src="source"></audio>
+    <audio ref="audio" :src="source" preload="none"></audio>
   </span>
 </template>
 
 <script>
-  const convertTimeHHMMSS = (val) => {
+const convertTimeHHMMSS = (val) => {
     let hhmmss = new Date(val * 1000).toISOString().substr(11, 8);
     return hhmmss.indexOf("00:") === 0 ? hhmmss.substr(3) : hhmmss;
-  };
+};
 
-  export default {
+export default {
     props: {
-      source: {
-        type: String,
-        default: ''
-      }
+        source: {
+            type: String,
+            default: ''
+        }
     },
     data() {
-      return {
-        audio: undefined,
-        loaded: false,
-        playing: false
-      }
+        return {
+            audio: undefined,
+            loaded: false,
+            playing: false
+        }
     },
     watch: {
-      source(newValue, oldValue) {
-        if (newValue && newValue != oldValue) {
-          this.init()
+        source(newValue, oldValue) {
+            if (newValue && newValue != oldValue) {
+                this.init()
+            }
+        },
+        playing(value) {
+            if (value) {
+                return this.audio.play();
+            }
+            this.audio.pause();
         }
-      },
-      playing(value) {
-        if (value) {
-          return this.audio.play();
-        }
-        this.audio.pause();
-      }
     },
     mounted() {
-      this.audio = this.$refs.audio
-      this.audio.addEventListener('loadeddata', this.loadeddata);
-      this.audio.addEventListener('pause', () => {
-        this.playing = false
-      });
-      this.audio.addEventListener('play', () => {
-        this.playing = true
-      });
+        this.audio = this.$refs.audio
+        this.audio.addEventListener('loadeddata', this.loadeddata);
+        this.audio.addEventListener('pause', () => {
+            this.playing = false
+        });
+        this.audio.addEventListener('play', () => {
+            this.playing = true
+        });
     },
     methods: {
-      init() {
-      },
-      loadeddata() {
-        if (this.audio.readyState >= 2) {
-          this.loaded = true
-          this.durationSeconds = parseInt(this.audio.duration)
-          return
-        }
-        throw new Error('Failed to load sound file.');
-      },
+        init() {
+        },
+        loadeddata() {
+            if (this.audio.readyState >= 2) {
+                this.loaded = true
+                this.durationSeconds = parseInt(this.audio.duration)
+                return
+            }
+            throw new Error('Failed to load sound file.');
+        },
     }
-  }
+}
 </script>

public/vendor/ModuleDeveloper/entry/moduleDeveloper.js

@@ -73,7 +73,7 @@ public function securityFix(AdminDialogPage $page)
                     file_put_contents(base_path('.env'), $content);
                 } catch (\Exception $e) {
                     BizException::throwsIfMessageMatch($e, [
-                        'Permission denied' => L('FileWriteNoPermission')
+                        'Permission denied' => L('FileWriteNoPermission') . '(.env)',
                     ]);
                 }
                 return Response::json(0, L('Operate Success'), null, '[reload]');