1.0
xin
2025-04-15 9703057956549369444720e429a1bda75a1c1178
1.0
44 files deleted
3 files added
4 files modified
3173 ■■■■■ changed files
.idea/compiler.xml 1 ●●●● patch | view | raw | blame | history
.idea/dataSources.xml 18 ●●●●● patch | view | raw | blame | history
.idea/inspectionProfiles/Project_Default.xml 8 ●●●●● patch | view | raw | blame | history
.idea/sqldialects.xml 7 ●●●●● patch | view | raw | blame | history
README.md 26 ●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/App.java 52 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/Database.java 43 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/Deploy.java 54 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/DeployHistory.java 46 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/Server.java 65 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/dto/AppQueryCriteria.java 27 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/dto/DatabaseQueryCriteria.java 30 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/dto/DeployHistoryQueryCriteria.java 30 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/dto/DeployQueryCriteria.java 30 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/dto/ServerQueryCriteria.java 27 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/enums/DataTypeEnum.java 121 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/domain/enums/MsgType.java 16 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/mapper/AppMapper.java 24 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/mapper/DatabaseMapper.java 24 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/mapper/DeployHistoryMapper.java 24 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/mapper/DeployMapper.java 26 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/mapper/DeployServerMapper.java 24 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/mapper/ServerMapper.java 26 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/rest/AppController.java 75 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/rest/DatabaseController.java 110 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/rest/DeployController.java 144 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/rest/DeployHistoryController.java 56 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/rest/ServerController.java 83 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/AppService.java 61 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/DatabaseService.java 68 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/DeployHistoryService.java 55 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/DeployService.java 96 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/ServerService.java 76 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/impl/AppServiceImpl.java 106 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/impl/DatabaseServiceImpl.java 88 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/impl/DeployHistoryServiceImpl.java 70 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/impl/DeployServiceImpl.java 414 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/impl/ServerServiceImpl.java 99 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/websocket/SocketMsg.java 19 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/service/websocket/WebSocketServer.java 119 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/util/ExecuteShellUtil.java 87 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/util/ScpClientUtil.java 87 ●●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/maint/util/SqlUtils.java 216 ●●●●● patch | view | raw | blame | history
oying-system/src/main/resources/config/application-dev.yml 2 ●●● patch | view | raw | blame | history
oying-system/src/main/resources/config/application-prod.yml 6 ●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/maint/AppMapper.xml 37 ●●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/maint/DatabaseMapper.xml 36 ●●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/maint/DeployHistoryMapper.xml 39 ●●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/maint/DeployMapper.xml 95 ●●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/maint/DeployServerMapper.xml 33 ●●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/maint/ServerMapper.xml 47 ●●●●● patch | view | raw | blame | history
.idea/compiler.xml
@@ -2,6 +2,7 @@
<project version="4">
  <component name="CompilerConfiguration">
    <annotationProcessing>
      <profile default="true" name="Default" enabled="true" />
      <profile name="Maven default annotation processors profile" enabled="true">
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
.idea/dataSources.xml
New file
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
    <data-source source="LOCAL" name="oying" uuid="ae90bd7e-992f-4e9a-bff6-a82171b032ef">
      <driver-ref>mysql.8</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
      <jdbc-url>jdbc:mysql://118.145.136.116:3306/oying</jdbc-url>
      <jdbc-additional-properties>
        <property name="com.intellij.clouds.kubernetes.db.host.port" />
        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
        <property name="com.intellij.clouds.kubernetes.db.container.port" />
      </jdbc-additional-properties>
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
  </component>
</project>
.idea/inspectionProfiles/Project_Default.xml
New file
@@ -0,0 +1,8 @@
<component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="JavadocDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="ADDITIONAL_TAGS" value="date,description" />
    </inspection_tool>
  </profile>
</component>
.idea/sqldialects.xml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="SqlDialectMappings">
    <file url="file://$PROJECT_DIR$" dialect="MySQL" />
    <file url="PROJECT" dialect="MySQL" />
  </component>
</project>
README.md
@@ -43,7 +43,7 @@
        - FileUtil 文件工具类
- oying-system 系统核心模块(系统启动入口)
    - sysrunner 程序启动后处理数据
    - modules 系统相关模块(登录授权、系统监控、定时任务、系统模块、运维模块)
    - modules 系统相关模块(登录授权、系统监控、定时任务、系统模块)
- oying-logging 系统日志模块
- oying-tools 系统第三方工具模块
    - email 邮件工具
@@ -54,29 +54,27 @@
一、*基础信息*
1. **用户(User)**:包括所有用户角色(商户、消费者、骑手、代货商、拉新代理等),需要通过角色字段区分。
2. **商户(Merchant)**:普通商户、大型商户,大型商户可以管理多个门店。
2. **门店(Store)**:商户可以拥有多个门店,每个门店有独立的信息。
3. **门店(Store)**:商户可以拥有多个门店,每个门店有独立的信息。
3. **商品(Product)**:由商户或代货商发布,需要包含商品名称、价格、库存等信息,可能关联到分类和参数。
4. **商品(Product)**:由商户或代货商发布,需要包含商品名称、价格、库存等信息,可能关联到分类和参数。
4. **商品分类(Category)**:后台统一维护的商品分类。
5. **商品分类(Category)**:后台统一维护的商品分类。
5. **订单(Order)**:消费者下单生成的订单和明细,包含订单状态、商品列表、价格、配送信息等。
6. **订单(Order)**:消费者下单生成的订单和明细,包含订单状态、商品列表、价格、配送信息等。
6. **骑手(Rider)**:负责配送订单的骑手信息。
7. **骑手(Rider)**:负责配送订单的骑手信息。
7. **配送(Delivery)**:订单的配送信息,关联骑手和订单。
8. **配送(Delivery)**:订单的配送信息,关联骑手和订单。
8. **评价(Review)**:消费者对商品和服务的评价。
9. **评价(Review)**:消费者对商品和服务的评价。
9. **库存(Inventory)**:<font color="red">(库存维护)</font>商品的库存信息,可能关联到门店。
10. **库存(Inventory)**:<font color="red">(库存维护)</font>商品的库存信息,可能关联到门店。
10. **提现记录(Withdrawal)**:商户和骑手的提现记录。<font color="red">(分成规则)</font>
11. **提现记录(Withdrawal)**:商户和骑手的提现记录。<font color="red">(分成规则)</font>
11. **消息(Message)**:系统消息、订单消息、顾客留言等。
12. **消息(Message)**:系统消息、订单消息、顾客留言等。
13. **数据统计(Statistics)**:存储各类统计信息,如订单数量、销售额等
12. **数据统计(Statistics)**:存储各类统计信息,如订单数量、销售额等
二、 *第三方信息*
1. **支付方式**
oying-system/src/main/java/com/oying/modules/maint/domain/App.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/Database.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/Deploy.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/DeployHistory.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/Server.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/dto/AppQueryCriteria.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/dto/DatabaseQueryCriteria.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/dto/DeployHistoryQueryCriteria.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/dto/DeployQueryCriteria.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/dto/ServerQueryCriteria.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/enums/DataTypeEnum.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/domain/enums/MsgType.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/mapper/AppMapper.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/mapper/DatabaseMapper.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/mapper/DeployHistoryMapper.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/mapper/DeployMapper.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/mapper/DeployServerMapper.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/mapper/ServerMapper.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/rest/AppController.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/rest/DatabaseController.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/rest/DeployController.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/rest/DeployHistoryController.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/rest/ServerController.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/AppService.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/DatabaseService.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/DeployHistoryService.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/DeployService.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/ServerService.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/impl/AppServiceImpl.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/impl/DatabaseServiceImpl.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/impl/DeployHistoryServiceImpl.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/impl/DeployServiceImpl.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/impl/ServerServiceImpl.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/websocket/SocketMsg.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/service/websocket/WebSocketServer.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/util/ExecuteShellUtil.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/util/ScpClientUtil.java
File was deleted
oying-system/src/main/java/com/oying/modules/maint/util/SqlUtils.java
File was deleted
oying-system/src/main/resources/config/application-dev.yml
@@ -62,7 +62,7 @@
  #  验证码
  code:
    #  验证码类型配置 查看 LoginProperties 类
    code-type: arithmetic
    code-type: spec
    #  登录图形验证码有效时间/分钟
    expiration: 2
    #  验证码高度
oying-system/src/main/resources/config/application-prod.yml
@@ -66,7 +66,7 @@
  #  验证码
  code:
    #  验证码类型配置 查看 LoginProperties 类
    code-type: arithmetic
    code-type: spec
    #  登录图形验证码有效时间/分钟
    expiration: 2
    #  验证码高度
@@ -119,8 +119,8 @@
    path: ~/file/
    avatar: ~/avatar/
  linux:
    path: /home/oying/file/
    avatar: /home/oying/avatar/
    path: /opt/oying/file/
    avatar: /opt/oying/avatar/
  windows:
    path: C:\oying\file\
    avatar: C:\oying\avatar\
oying-system/src/main/resources/mapper/maint/AppMapper.xml
File was deleted
oying-system/src/main/resources/mapper/maint/DatabaseMapper.xml
File was deleted
oying-system/src/main/resources/mapper/maint/DeployHistoryMapper.xml
File was deleted
oying-system/src/main/resources/mapper/maint/DeployMapper.xml
File was deleted
oying-system/src/main/resources/mapper/maint/DeployServerMapper.xml
File was deleted
oying-system/src/main/resources/mapper/maint/ServerMapper.xml
File was deleted