diff --git a/.idea/dev-aid.iml b/.idea/dev-aid.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/dev-aid.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3e6ffa9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..c7d22da --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1744619203024 + + + + + + \ No newline at end of file diff --git a/judicial/.idea/.idea.pa-iot.dir/.idea/.gitignore b/deploy/judicial/.idea/.idea.pa-iot.dir/.idea/.gitignore similarity index 100% rename from judicial/.idea/.idea.pa-iot.dir/.idea/.gitignore rename to deploy/judicial/.idea/.idea.pa-iot.dir/.idea/.gitignore diff --git a/judicial/.idea/.idea.pa-iot.dir/.idea/encodings.xml b/deploy/judicial/.idea/.idea.pa-iot.dir/.idea/encodings.xml similarity index 100% rename from judicial/.idea/.idea.pa-iot.dir/.idea/encodings.xml rename to deploy/judicial/.idea/.idea.pa-iot.dir/.idea/encodings.xml diff --git a/judicial/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml b/deploy/judicial/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml similarity index 100% rename from judicial/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml rename to deploy/judicial/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml diff --git a/judicial/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml b/deploy/judicial/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml similarity index 100% rename from judicial/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml rename to deploy/judicial/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml diff --git a/judicial/.idea/.idea.pa-iot.dir/.idea/vcs.xml b/deploy/judicial/.idea/.idea.pa-iot.dir/.idea/vcs.xml similarity index 100% rename from judicial/.idea/.idea.pa-iot.dir/.idea/vcs.xml rename to deploy/judicial/.idea/.idea.pa-iot.dir/.idea/vcs.xml diff --git a/judicial/assets/7DBF268C-0F77-4d35-8E66-3D70C01FCA5C.png b/deploy/judicial/assets/7DBF268C-0F77-4d35-8E66-3D70C01FCA5C.png similarity index 100% rename from judicial/assets/7DBF268C-0F77-4d35-8E66-3D70C01FCA5C.png rename to deploy/judicial/assets/7DBF268C-0F77-4d35-8E66-3D70C01FCA5C.png diff --git a/judicial/assets/A7A6630F-D145-4bce-9FCD-24CAD2AC6A54.png b/deploy/judicial/assets/A7A6630F-D145-4bce-9FCD-24CAD2AC6A54.png similarity index 100% rename from judicial/assets/A7A6630F-D145-4bce-9FCD-24CAD2AC6A54.png rename to deploy/judicial/assets/A7A6630F-D145-4bce-9FCD-24CAD2AC6A54.png diff --git a/judicial/assets/E707572E-3A9F-421f-A6A3-5BED39C9BD0A.png b/deploy/judicial/assets/E707572E-3A9F-421f-A6A3-5BED39C9BD0A.png similarity index 100% rename from judicial/assets/E707572E-3A9F-421f-A6A3-5BED39C9BD0A.png rename to deploy/judicial/assets/E707572E-3A9F-421f-A6A3-5BED39C9BD0A.png diff --git a/judicial/assets/F84E1FF0-F3F1-4135-B9A1-3D205EC78A79.png b/deploy/judicial/assets/F84E1FF0-F3F1-4135-B9A1-3D205EC78A79.png similarity index 100% rename from judicial/assets/F84E1FF0-F3F1-4135-B9A1-3D205EC78A79.png rename to deploy/judicial/assets/F84E1FF0-F3F1-4135-B9A1-3D205EC78A79.png diff --git a/judicial/assets/image-20240725143851169.png b/deploy/judicial/assets/image-20240725143851169.png similarity index 100% rename from judicial/assets/image-20240725143851169.png rename to deploy/judicial/assets/image-20240725143851169.png diff --git a/judicial/开发文档.md b/deploy/judicial/开发文档.md similarity index 100% rename from judicial/开发文档.md rename to deploy/judicial/开发文档.md diff --git a/deploy/oa/assets/img.png b/deploy/oa/assets/img.png new file mode 100644 index 0000000..90a3278 Binary files /dev/null and b/deploy/oa/assets/img.png differ diff --git a/deploy/oa/assets/img_1.png b/deploy/oa/assets/img_1.png new file mode 100644 index 0000000..1e8ad0b Binary files /dev/null and b/deploy/oa/assets/img_1.png differ diff --git a/deploy/oa/assets/img_2.png b/deploy/oa/assets/img_2.png new file mode 100644 index 0000000..00e2f8a Binary files /dev/null and b/deploy/oa/assets/img_2.png differ diff --git a/deploy/oa/assets/img_3.png b/deploy/oa/assets/img_3.png new file mode 100644 index 0000000..32539d3 Binary files /dev/null and b/deploy/oa/assets/img_3.png differ diff --git a/deploy/oa/assets/img_4.png b/deploy/oa/assets/img_4.png new file mode 100644 index 0000000..2aa3850 Binary files /dev/null and b/deploy/oa/assets/img_4.png differ diff --git a/deploy/oa/开发文档.md b/deploy/oa/开发文档.md new file mode 100644 index 0000000..a60b7fb --- /dev/null +++ b/deploy/oa/开发文档.md @@ -0,0 +1,66 @@ +# 项目结构 + +## jeecg-boot目录结构 + +![img](assets/img.png) + +## jeecg-boot-starter目录结构 + +![img](assets/img_1.png) + +# 华为云上前后端位置 +- 前后端位置:/workspace/www/oa +- 后端地址:/workspace/www/oa/jeecg-boot +![img](assets/img_2.png) + **说明:** + - 配置文件 + - Dockerfile:docker + - 启动服务jar包 + - jeecg-system-start-3.7.4.jar + - 后端更新流程 + - mvn clean install + - jeecg-boot/jeecg-module-system/jeecg-system-start/target/jeecg-system-start-3.7.4.jar 地址下拿取jar包上传华为云服务器 + - 停服务:docker stop jeecg-boot + - 删镜像:docker rm jeecg-boot + - 跳转至启动目录:cd /workspace/www/oa/jeecg-boot + - 构建(不要忘记后面空格和点!!!):docker build -t jeecg-boot:1.0 . + - 启动:docker run -it --name jeecg-boot -v /workspace/www/oa/jeecg-boot -p 8083:8080 --restart=always -d jeecg-boot:1.0 + - 查看是否启动成功:docker ps 命令看jeecg-boot是否正常 + - 查看后端日志:docker logs jeecg-boot | tail -n 100 +- 前端地址:/workspace/www/oa/jeecg-boot-vue3 +![img](assets/img_3.png) + **说明:** + - 相当于dist文件目录下,部署时(jeecg-boot-vue3+时间)改名后 +dist在/workspace/www/oa改名为jeecg-boot-vue3即可 + - 前端使用nginx启动 + - nginx配置文件地址:/workspace/nginx/conf.d + ![img](assets/img_4.png) + - pnpm run build + - 前端打包后压缩dist文件夹上传压缩包至/workspace/www/oa目录下 + - 重新命名jeecg-boot-vue3文件夹(jeecg-boot-vue3+时间) + - 解压dist.zip + - cd /workspace/www/oa + - unzip dist.zip + - 重命名dist文件夹为jeecg-boot-vue3 + - 重启nginx:docker restart nginx +- 数据库: + - datasource: + master: + url: jdbc:mysql://yinghuasoft.com:3305/jeecg-boot?useSSL=false&serverTimezone=UTC&useInformationSchema=true + username: root + password: Yinghua@ecs + driver-class-name: com.mysql.cj.jdbc.Driver +- redis: + - redis: + database: 0 + host: 123.249.108.39 + port: 6379 + password: + lettuce: + pool: + max-active: 100 + max-idle: 50 + min-idle: 10 + **前后端访问地址** +- 前端访问地址:https://oa.yinghuasoft.com +- 后端api访问地址:http://123.249.108.39:8083/jeecg-boot/doc.html#/home \ No newline at end of file diff --git a/pa-iot/.idea/.idea.pa-iot.dir/.idea/.gitignore b/deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/.gitignore similarity index 100% rename from pa-iot/.idea/.idea.pa-iot.dir/.idea/.gitignore rename to deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/.gitignore diff --git a/pa-iot/.idea/.idea.pa-iot.dir/.idea/encodings.xml b/deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/encodings.xml similarity index 100% rename from pa-iot/.idea/.idea.pa-iot.dir/.idea/encodings.xml rename to deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/encodings.xml diff --git a/pa-iot/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml b/deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml similarity index 100% rename from pa-iot/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml rename to deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml diff --git a/pa-iot/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml b/deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml similarity index 100% rename from pa-iot/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml rename to deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml diff --git a/pa-iot/.idea/.idea.pa-iot.dir/.idea/vcs.xml b/deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/vcs.xml similarity index 100% rename from pa-iot/.idea/.idea.pa-iot.dir/.idea/vcs.xml rename to deploy/pa-iot/.idea/.idea.pa-iot.dir/.idea/vcs.xml diff --git a/pa-iot/assets/88651885-945F-4c07-A775-823ABBE2BA00.png b/deploy/pa-iot/assets/88651885-945F-4c07-A775-823ABBE2BA00.png similarity index 100% rename from pa-iot/assets/88651885-945F-4c07-A775-823ABBE2BA00.png rename to deploy/pa-iot/assets/88651885-945F-4c07-A775-823ABBE2BA00.png diff --git a/pa-iot/assets/8FB73C8A-9A7B-48b3-871F-0219AF7C0C25.png b/deploy/pa-iot/assets/8FB73C8A-9A7B-48b3-871F-0219AF7C0C25.png similarity index 100% rename from pa-iot/assets/8FB73C8A-9A7B-48b3-871F-0219AF7C0C25.png rename to deploy/pa-iot/assets/8FB73C8A-9A7B-48b3-871F-0219AF7C0C25.png diff --git a/pa-iot/assets/B6E9C2FF-B565-4e5d-9BEB-B4736DCCDB3C.png b/deploy/pa-iot/assets/B6E9C2FF-B565-4e5d-9BEB-B4736DCCDB3C.png similarity index 100% rename from pa-iot/assets/B6E9C2FF-B565-4e5d-9BEB-B4736DCCDB3C.png rename to deploy/pa-iot/assets/B6E9C2FF-B565-4e5d-9BEB-B4736DCCDB3C.png diff --git a/pa-iot/assets/DB8AF576-7C1C-4b06-B538-99B3DA4147D5.png b/deploy/pa-iot/assets/DB8AF576-7C1C-4b06-B538-99B3DA4147D5.png similarity index 100% rename from pa-iot/assets/DB8AF576-7C1C-4b06-B538-99B3DA4147D5.png rename to deploy/pa-iot/assets/DB8AF576-7C1C-4b06-B538-99B3DA4147D5.png diff --git a/pa-iot/assets/clip_image001.png b/deploy/pa-iot/assets/clip_image001.png similarity index 100% rename from pa-iot/assets/clip_image001.png rename to deploy/pa-iot/assets/clip_image001.png diff --git a/pa-iot/assets/clip_image002.png b/deploy/pa-iot/assets/clip_image002.png similarity index 100% rename from pa-iot/assets/clip_image002.png rename to deploy/pa-iot/assets/clip_image002.png diff --git a/pa-iot/assets/image-20240724091848331.png b/deploy/pa-iot/assets/image-20240724091848331.png similarity index 100% rename from pa-iot/assets/image-20240724091848331.png rename to deploy/pa-iot/assets/image-20240724091848331.png diff --git a/pa-iot/assets/image-20240725143015574.png b/deploy/pa-iot/assets/image-20240725143015574.png similarity index 100% rename from pa-iot/assets/image-20240725143015574.png rename to deploy/pa-iot/assets/image-20240725143015574.png diff --git a/pa-iot/assets/image-20240725143104943.png b/deploy/pa-iot/assets/image-20240725143104943.png similarity index 100% rename from pa-iot/assets/image-20240725143104943.png rename to deploy/pa-iot/assets/image-20240725143104943.png diff --git a/pa-iot/assets/image-20240725143151090.png b/deploy/pa-iot/assets/image-20240725143151090.png similarity index 100% rename from pa-iot/assets/image-20240725143151090.png rename to deploy/pa-iot/assets/image-20240725143151090.png diff --git a/pa-iot/assets/image-20240725143338755.png b/deploy/pa-iot/assets/image-20240725143338755.png similarity index 100% rename from pa-iot/assets/image-20240725143338755.png rename to deploy/pa-iot/assets/image-20240725143338755.png diff --git a/pa-iot/assets/image-20240725143419574.png b/deploy/pa-iot/assets/image-20240725143419574.png similarity index 100% rename from pa-iot/assets/image-20240725143419574.png rename to deploy/pa-iot/assets/image-20240725143419574.png diff --git a/pa-iot/assets/image-20240725143851169.png b/deploy/pa-iot/assets/image-20240725143851169.png similarity index 100% rename from pa-iot/assets/image-20240725143851169.png rename to deploy/pa-iot/assets/image-20240725143851169.png diff --git a/pa-iot/publish/Mirror.jpg b/deploy/pa-iot/publish/Mirror.jpg similarity index 100% rename from pa-iot/publish/Mirror.jpg rename to deploy/pa-iot/publish/Mirror.jpg diff --git a/pa-iot/publish/PackagConfig.png b/deploy/pa-iot/publish/PackagConfig.png similarity index 100% rename from pa-iot/publish/PackagConfig.png rename to deploy/pa-iot/publish/PackagConfig.png diff --git a/pa-iot/publish/SelectPackage.png b/deploy/pa-iot/publish/SelectPackage.png similarity index 100% rename from pa-iot/publish/SelectPackage.png rename to deploy/pa-iot/publish/SelectPackage.png diff --git a/pa-iot/publish/ServerControl.png b/deploy/pa-iot/publish/ServerControl.png similarity index 100% rename from pa-iot/publish/ServerControl.png rename to deploy/pa-iot/publish/ServerControl.png diff --git a/pa-iot/publish/dadbr.md b/deploy/pa-iot/publish/dadbr.md similarity index 100% rename from pa-iot/publish/dadbr.md rename to deploy/pa-iot/publish/dadbr.md diff --git a/pa-iot/publish/guide.md b/deploy/pa-iot/publish/guide.md similarity index 100% rename from pa-iot/publish/guide.md rename to deploy/pa-iot/publish/guide.md diff --git a/pa-iot/publish/login.png b/deploy/pa-iot/publish/login.png similarity index 100% rename from pa-iot/publish/login.png rename to deploy/pa-iot/publish/login.png diff --git a/pa-iot/开发文档.md b/deploy/pa-iot/开发文档.md similarity index 100% rename from pa-iot/开发文档.md rename to deploy/pa-iot/开发文档.md