Merge pull request #51 from qianmoQ/feature-dev

qianmoQ · web-flow · commit 760bba085667 · 2024-07-18T15:34:27.000+08:00
发布 `2024.1.2`
diff --git a/core/infosphere-common/pom.xml b/core/infosphere-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.devlive.infosphere</groupId>
         <artifactId>infosphere</artifactId>
-        <version>2024.1.2-SNAPSHOT</version>
+        <version>2024.1.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/infosphere-common/src/main/java/org/devlive/infosphere/common/response/CommonResponse.java b/core/infosphere-common/src/main/java/org/devlive/infosphere/common/response/CommonResponse.java
@@ -29,7 +29,7 @@ public static <T> CommonResponse<T> success(T data)
     public static <T> CommonResponse<T> failure(String message)
     {
         CommonResponse<T> response = new CommonResponse<>();
-        response.code = 401;
+        response.code = 400;
         response.status = false;
         response.message = message;
         response.data = null;
@@ -39,7 +39,7 @@ public static <T> CommonResponse<T> failure(String message)
     public static <T> CommonResponse<T> unauthorized(String message)
     {
         CommonResponse<T> response = new CommonResponse<>();
-        response.code = 400;
+        response.code = 403;
         response.status = false;
         response.message = message;
         response.data = null;
diff --git a/core/infosphere-console/package.json b/core/infosphere-console/package.json
@@ -1,7 +1,7 @@
 {
   "name": "infosphere-console",
   "private": true,
-  "version": "2024.1.2-SNAPSHOT",
+  "version": "2024.1.2",
   "type": "module",
   "scripts": {
     "predev": "sh setup.sh",
diff --git a/core/infosphere-console/src/views/components/cropper/CropperHome.vue b/core/infosphere-console/src/views/components/cropper/CropperHome.vue
@@ -18,10 +18,10 @@
     </div>
     <template #footer>
       <div class="space-x-2">
-        <Button @click="isShowModal = false">
+        <Button size="sm" @click="isShowModal = false">
           取消
         </Button>
-        <Button variant="destructive" @click="clear">
+        <Button variant="destructive" size="sm" @click="clear">
           清除
         </Button>
         <Button class="btn" size="sm" variant="destructive" @click="reset">
diff --git a/core/infosphere-console/src/views/components/pageable/BookCoverPageable.vue b/core/infosphere-console/src/views/components/pageable/BookCoverPageable.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <div class="grid grid-cols-2 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8 xl:grid-cols-10 gap-4">
+    <div class="grid grid-cols-2 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8 xl:grid-cols-8 gap-4">
       <div v-for="item in items" :key="item.identify" class="flex flex-col items-center">
         <RouterLink :to="`/book/info/${item.identify}`">
           <InfoSphereTooltip position="top">
             <template #title>
-              <div class="w-full h-40">
+              <div class="w-full h-48">
                 <AspectRatio class="w-full h-full">
                   <img :src="item.cover ? item.cover : '/static/images/default-cover.png'" :alt="item.name" class="rounded-md w-full h-full border-2"/>
                 </AspectRatio>
diff --git a/core/infosphere-console/src/views/pages/book/BookInfo.vue b/core/infosphere-console/src/views/pages/book/BookInfo.vue
@@ -6,7 +6,7 @@
         <CardHeader class="p-3 space-y-1.5">
           <CardTitle class="space-x-4 flex items-center">
             <span class="font-bold text-2xl">{{ info.name }}</span>
-            <div class="flex items-center space-x-2" v-if="info.user?.id === user?.id">
+            <div class="flex space-x-2" v-if="info.user?.id === user?.id">
               <InfoSphereTooltip>
                 <template #title>
                   <RouterLink :to="`/book/writer/${info.identify}`">
diff --git a/core/infosphere-console/src/views/pages/book/components/BookSidebar.vue b/core/infosphere-console/src/views/pages/book/components/BookSidebar.vue
@@ -7,7 +7,7 @@
           <template #node="{ node }">
             <ContextMenu @update:open="selectItem.identify = node.identify">
               <ContextMenuTrigger class="text-xs text-gray-500">
-                <div class="flex w-full flex-col pt-2 pb-2">
+                <div class="flex w-full flex-col pt-2 pb-2" :key="node.identify">
                   <div class="flex items-center">
                     <div class="flex items-center">
                       <div class="font-semibold">
@@ -35,7 +35,7 @@ import { Document } from '@/model/document.ts'
 import InfoSphereLoading from '@/views/components/loading/InfoSphereLoading.vue'
 import BookService from '@/service/book.ts'
 import DefaultTree from '@/views/components/tree/DefaultTree.vue'
-import { ContextMenu } from '@/components/ui/context-menu'
+import { ContextMenu, ContextMenuTrigger } from '@/components/ui/context-menu'
 
 export default defineComponent({
   name: 'BookSidebar',
@@ -46,7 +46,7 @@ export default defineComponent({
     }
   },
   components: {
-    ContextMenu,
+    ContextMenu, ContextMenuTrigger,
     DefaultTree,
     InfoSphereLoading,
     ScrollBar, ScrollArea
diff --git a/core/infosphere-console/src/views/pages/explore/ExploreHome.vue b/core/infosphere-console/src/views/pages/explore/ExploreHome.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="flex-col md:flex">
-    <div class="flex flex-col space-y-8 space-x-12 mt-3">
+    <div class="flex flex-col space-y-8 space-x-12 mt-3 mb-3">
       <div class="w-full max-w-7xl mx-auto">
         <div class="space-y-3">
           <div class="flex justify-between">
-            <Label class="text-xl">书籍列表 ({{ items?.length }})</Label>
+            <Label class="text-xl">书籍列表 ({{ pagination?.total }})</Label>
           </div>
           <Separator/>
           <div class="space-x-3">
@@ -42,7 +42,7 @@ export default defineComponent({
   },
   created()
   {
-    this.pagination = { page: 1, size: 100, visibility: true, excludeUser: true }
+    this.pagination = { page: 1, size: 32, visibility: true, excludeUser: true }
     this.initialize()
   },
   methods: {
diff --git a/core/infosphere-security/pom.xml b/core/infosphere-security/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.devlive.infosphere</groupId>
         <artifactId>infosphere</artifactId>
-        <version>2024.1.2-SNAPSHOT</version>
+        <version>2024.1.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/infosphere-server/pom.xml b/core/infosphere-server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.devlive.infosphere</groupId>
         <artifactId>infosphere</artifactId>
-        <version>2024.1.2-SNAPSHOT</version>
+        <version>2024.1.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/infosphere-service/pom.xml b/core/infosphere-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.devlive.infosphere</groupId>
         <artifactId>infosphere</artifactId>
-        <version>2024.1.2-SNAPSHOT</version>
+        <version>2024.1.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/docs/docs/download.md b/docs/docs/download.md
@@ -28,7 +28,7 @@ hide:
 
     <br />
 
-    [InfoSphere-2024.01.1.tar.gz](xxx){ .md-button .md-button-primary }
+    [InfoSphere-2024.1.2.tar.gz](xxx){ .md-button .md-button-primary }
 
 - :material-more: __更多__
 
diff --git a/docs/docs/release/2024.01.1.md b/docs/docs/release/2024.01.1.md
@@ -0,0 +1,29 @@
+**InfoSphere 发布!**
+
+|    发布版本     |     发布时间     |
+|:-----------:|:------------:|
+| `2024.01.1` | `2024-07-12` |
+
+> 该版本为整体重构版本，移除了之前所有的功能。
+
+## 基本功能
+
+---
+
+- 支持用户登录
+- 支持用户注册
+- 支持修改基本信息
+- 支持修改密码
+
+## 书籍功能
+
+---
+
+- 支持创建 & 修改书籍
+- 支持首页最新发布书籍
+- 支持公开书籍
+- 支持阅读书籍
+- 支持书籍编写文档
+- 支持书籍公开 & 私有分类
+- 支持书籍上传封面
+- 支持书籍概览信息
diff --git a/docs/docs/release/latest.md b/docs/docs/release/latest.md
@@ -2,28 +2,22 @@
 
 |    发布版本     |     发布时间     |
 |:-----------:|:------------:|
-| `2024.01.1` | `2024-07-12` |
-
-> 该版本为整体重构版本，移除了之前所有的功能。
+| `2024.1.2` | `2024-07-18` |
 
 ## 基本功能
 
 ---
 
-- 支持用户登录
-- 支持用户注册
-- 支持修改基本信息
-- 支持修改密码
+- 重命名 docker compose 组件名称
+- 修改探索页面分页布局
 
 ## 书籍功能
 
 ---
 
-- 支持创建 & 修改书籍
-- 支持首页最新发布书籍
-- 支持公开书籍
-- 支持阅读书籍
-- 支持书籍编写文档
-- 支持书籍公开 & 私有分类
-- 支持书籍上传封面
-- 支持书籍概览信息
+- 支持公开书籍未登录访问
+- 支持编写文档树形菜单展示
+- 支持阅读文档树形菜单展示
+- 支持右键菜单创建文档
+- 支持删除文档
+- 支持书籍状态配置
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -9,7 +9,7 @@ repo_url: https://github.com/devlive-community/incubator-infosphere
 edit_uri: "https://github.com/devlive-community/incubator-infosphere/blob/dev/docs/docs"
 
 banners:
-  - title: InfoSphere 2024.01.1  已经发布。
+  - title: InfoSphere 2024.1.2  已经发布。
     link: /release-latest.html
     description: <a href="https://github.com/devlive-community/incubator-infosphere" class="text-white"> 如果您喜欢 InfoSphere ? 请前往 GitHub 给我们点击一个 🌟</a>
 
@@ -69,5 +69,6 @@ nav:
       - reference/getStarted/installFromDocker.md
       - reference/getStarted/installFromDockerCompose.md
   - 更新日志:
-      - 2024.01.1 (latest): release/latest.md
+      - 2024.1.2 (latest): release/latest.md
+      - 2024.01.1: release/2024.01.1.md
       - 1.5.0 (Old): release/1.5.0.md
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.devlive.infosphere</groupId>
     <artifactId>infosphere</artifactId>
     <packaging>pom</packaging>
-    <version>2024.1.2-SNAPSHOT</version>
+    <version>2024.1.2</version>
 
     <modules>
         <module>core/infosphere-common</module>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "infosphere-console",`
`3`	`3`	`"private": true,`
`4`		`- "version": "2024.1.2-SNAPSHOT",`
	`4`	`+ "version": "2024.1.2",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"predev": "sh setup.sh",`