From 47f061fd43565eadf91743784119ecdead186734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=AD=E5=A6=82?= <8775@163.com> Date: Sun, 22 Dec 2024 23:09:56 +0800 Subject: [PATCH] 5.0 --- pom.xml | 7 ++++++ sop-admin/sop-admin-backend/pom.xml | 11 +++++----- .../controller/website/WebsiteController.java | 22 +++++++++---------- .../public/platform-config.json | 2 +- .../sop-website-frontend/.env.production | 2 +- sop-website/sop-website-frontend/package.json | 12 +++++----- .../public/platform-config.json | 2 +- 7 files changed, 32 insertions(+), 26 deletions(-) mode change 100644 => 100755 pom.xml mode change 100644 => 100755 sop-admin/sop-admin-backend/pom.xml mode change 100644 => 100755 sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java mode change 100644 => 100755 sop-admin/sop-admin-frontend/public/platform-config.json mode change 100644 => 100755 sop-website/sop-website-frontend/.env.production mode change 100644 => 100755 sop-website/sop-website-frontend/package.json mode change 100644 => 100755 sop-website/sop-website-frontend/public/platform-config.json diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 3967de0a..66517aab --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ sop-example sop-admin + sop-website sop-test sop-sdk sop-gateway @@ -96,6 +97,12 @@ 1.0.0 + + com.alibaba.fastjson2 + fastjson2 + 2.0.52 + + com.squareup.okhttp3 okhttp diff --git a/sop-admin/sop-admin-backend/pom.xml b/sop-admin/sop-admin-backend/pom.xml old mode 100644 new mode 100755 index 5616d991..dc671027 --- a/sop-admin/sop-admin-backend/pom.xml +++ b/sop-admin/sop-admin-backend/pom.xml @@ -20,12 +20,11 @@ - backend-common - backend-service - backend-dao - backend-boot - backend-web - website-web + admin-common + admin-service + admin-dao + admin-boot + admin-web diff --git a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java old mode 100644 new mode 100755 index 5840202d..5cc98562 --- a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java +++ b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java @@ -1,15 +1,15 @@ -package com.gitee.sop.adminbackend.controller.website; +package com.gitee.sop.admin.controller.website; -import com.gitee.sop.adminbackend.common.annotation.NoToken; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.website.vo.DocAppVO; -import com.gitee.sop.adminbackend.controller.website.vo.DocInfoViewVO; -import com.gitee.sop.adminbackend.controller.website.vo.DocInfoTreeVO; -import com.gitee.sop.adminbackend.service.doc.dto.DocAppDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoTreeDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoViewDTO; -import com.gitee.sop.adminbackend.service.website.WebsiteService; +import com.gitee.sop.admin.common.annotation.NoToken; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.website.vo.DocAppVO; +import com.gitee.sop.admin.controller.website.vo.DocInfoViewVO; +import com.gitee.sop.admin.controller.website.vo.DocInfoTreeVO; +import com.gitee.sop.admin.service.doc.dto.DocAppDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoTreeDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoViewDTO; +import com.gitee.sop.admin.service.website.WebsiteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/sop-admin/sop-admin-frontend/public/platform-config.json b/sop-admin/sop-admin-frontend/public/platform-config.json old mode 100644 new mode 100755 index 1ed42be9..49e8fccc --- a/sop-admin/sop-admin-frontend/public/platform-config.json +++ b/sop-admin/sop-admin-frontend/public/platform-config.json @@ -22,6 +22,6 @@ "MenuArrowIconNoTransition": false, "CachingAsyncRoutes": false, "TooltipEffect": "light", - "ResponsiveStorageNameSpace": "responsive-", + "ResponsiveStorageNameSpace": "sopadmin-responsive-", "MenuSearchHistory": 6 } diff --git a/sop-website/sop-website-frontend/.env.production b/sop-website/sop-website-frontend/.env.production old mode 100644 new mode 100755 index 84e60861..9f3c269b --- a/sop-website/sop-website-frontend/.env.production +++ b/sop-website/sop-website-frontend/.env.production @@ -10,4 +10,4 @@ VITE_CDN = false # 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件） # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） # 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） -VITE_COMPRESSION = "none" \ No newline at end of file +VITE_COMPRESSION = "none" diff --git a/sop-website/sop-website-frontend/package.json b/sop-website/sop-website-frontend/package.json old mode 100644 new mode 100755 index 11c0af2f..66ae3be8 --- a/sop-website/sop-website-frontend/package.json +++ b/sop-website/sop-website-frontend/package.json @@ -48,10 +48,10 @@ "url": "https://github.com/xiaoxian521" }, "dependencies": { - "@bytemd/plugin-gemoji": "^1.21.0", - "@bytemd/plugin-gfm": "^1.21.0", - "@bytemd/plugin-highlight": "^1.21.0", - "@bytemd/vue-next": "^1.21.0", + "@bytemd/plugin-gemoji": "1.21.0", + "@bytemd/plugin-gfm": "1.21.0", + "@bytemd/plugin-highlight": "1.21.0", + "@bytemd/vue-next": "1.21.0", "@pureadmin/descriptions": "1.2.1", "@pureadmin/table": "3.2.0", "@pureadmin/utils": "2.4.8", @@ -62,8 +62,8 @@ "dayjs": "1.11.12", "echarts": "5.5.1", "element-plus": "2.8.0", - "github-markdown-css": "^5.8.1", - "highlight.js": "^11.10.0", + "github-markdown-css": "5.8.1", + "highlight.js": "11.10.0", "js-cookie": "3.0.5", "localforage": "1.10.0", "mitt": "3.0.1", diff --git a/sop-website/sop-website-frontend/public/platform-config.json b/sop-website/sop-website-frontend/public/platform-config.json old mode 100644 new mode 100755 index 6dfe2028..e07bd17c --- a/sop-website/sop-website-frontend/public/platform-config.json +++ b/sop-website/sop-website-frontend/public/platform-config.json @@ -22,6 +22,6 @@ "MenuArrowIconNoTransition": false, "CachingAsyncRoutes": false, "TooltipEffect": "light", - "ResponsiveStorageNameSpace": "responsive-", + "ResponsiveStorageNameSpace": "sopwebsite-responsive-", "MenuSearchHistory": 6 }