Merge branch 'main' of https://git.yinghuasoft.com/yhsoft/dev-aid

.idea/dev-aid.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/dev-aid.iml" filepath="$PROJECT_DIR$/.idea/dev-aid.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="bc251908-44d6-4fcd-9658-47ec29a19ed5" name="更改" comment="">
+      <change afterPath="$PROJECT_DIR$/deploy/oa/assets/img.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/deploy/oa/assets/img_1.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/deploy/oa/assets/img_2.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/deploy/oa/assets/img_3.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/deploy/oa/assets/img_4.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/deploy/oa/开发文档.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/.idea/.idea.pa-iot.dir/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/.idea/.idea.pa-iot.dir/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/.idea/.idea.pa-iot.dir/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/assets/7DBF268C-0F77-4d35-8E66-3D70C01FCA5C.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/assets/A7A6630F-D145-4bce-9FCD-24CAD2AC6A54.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/assets/E707572E-3A9F-421f-A6A3-5BED39C9BD0A.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/assets/F84E1FF0-F3F1-4135-B9A1-3D205EC78A79.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/assets/image-20240725143851169.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/judicial/开发文档.md" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/.idea/.idea.pa-iot.dir/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/.idea/.idea.pa-iot.dir/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/.idea/.idea.pa-iot.dir/.idea/git_toolbox_prj.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/.idea/.idea.pa-iot.dir/.idea/indexLayout.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/.idea/.idea.pa-iot.dir/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/88651885-945F-4c07-A775-823ABBE2BA00.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/8FB73C8A-9A7B-48b3-871F-0219AF7C0C25.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/B6E9C2FF-B565-4e5d-9BEB-B4736DCCDB3C.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/DB8AF576-7C1C-4b06-B538-99B3DA4147D5.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/clip_image001.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/clip_image002.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240724091848331.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240725143015574.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240725143104943.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240725143151090.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240725143338755.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240725143419574.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/assets/image-20240725143851169.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/Mirror.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/PackagConfig.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/SelectPackage.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/ServerControl.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/dadbr.md" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/guide.md" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/publish/login.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pa-iot/开发文档.md" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 5
+}]]></component>
+  <component name="ProjectId" id="2viDrtXbe35g88zRDFX3Z9SoUkL" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "main",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Users/admin/Desktop/project/dev-aid/dev-aid",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-jdk-9823dce3aa75-a94e463ab2e7-intellij.indexing.shared.core-IU-243.25659.59" />
+        <option value="bundled-js-predefined-d6986cc7102b-1632447f56bf-JavaScript-IU-243.25659.59" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="bc251908-44d6-4fcd-9658-47ec29a19ed5" name="更改" comment="" />
+      <created>1744619203024</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1744619203024</updated>
+      <workItem from="1744619204137" duration="4205000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>

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

工作规范/新员工快速上手.md

@@ -14,7 +14,7 @@
 - 公司 NPM 地址：<https://npm.yinghuasoft.com>
 - Rapid Design 文档: <https://rd-docs.yinghuasoft.com>
 - VS Code 必装插件列表：`Auto Close Tag`, `Auto Rename Tag`, `Code Spell Checker`, `ESLint, Path Intellisense`
-  , `Prettier - Code formatter`, `Less IntelliSense`, `Sass (.sass only)`, `Vue VSCode Snippets`, `vue3-snippets-for-vscode`, `Ant Design Vue helper`, `Tailwind CSS IntelliSense`, `TypeScript Vue Plugin (Volar)`, `Live Server`
+  , `Prettier - Code formatter`, `Less IntelliSense`, `Sass (.sass only)`, `Vue VSCode Snippets`, `vue3-snippets-for-vscode`, `Ant Design Vue helper`, `Tailwind CSS IntelliSense`, `Vue - Official`, `Live Server`
 
 ### 后端