From 0a3859b753c0dab2bb1f5676a25d26ebc1a86767 Mon Sep 17 00:00:00 2001 From: chenyuan <1154693969@qq.com> Date: Tue, 14 May 2024 18:18:32 +0800 Subject: [PATCH] add all --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 25 --------- .github/ISSUE_TEMPLATE/question.md | 34 ------------- .github/workflows/maven.yml | 30 ----------- .github/workflows/yudao-ui-admin.yml | 51 ------------------- pom.xml | 8 +-- yudao-server/pom.xml | 40 +++++++-------- .../yudao/server/controller/Student.java | 8 +++ .../src/main/resources/application-local.yaml | 27 +++++----- 8 files changed, 44 insertions(+), 179 deletions(-) delete mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md delete mode 100644 .github/ISSUE_TEMPLATE/question.md delete mode 100644 .github/workflows/maven.yml delete mode 100644 .github/workflows/yudao-ui-admin.yml create mode 100644 yudao-server/src/main/java/cn/iocoder/yudao/server/controller/Student.java diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md deleted file mode 100644 index 06e3de7c2e..0000000000 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ /dev/null @@ -1,25 +0,0 @@ -碰到问题，请在 搜索是否存在相似的 issue。 - -不按照模板提交的 issue，会被系统自动删除。 - -### 基本信息 - -- ruoyi-vue-pro 版本： -- 操作系统： -- 数据库： - -### 你猜测可能的原因 - -（必填）我花费了 2-4 小时自查，发现可能的原因是：xxxxxx - -### 复现步骤 - -第一步， - -第二步， - -第三步， - -### 报错信息 - -带上必要的截图 diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md deleted file mode 100644 index 6ed00a35c1..0000000000 --- a/.github/ISSUE_TEMPLATE/question.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -name: 问题反馈 -about: 请详细描述，以便更高快的获得到解决 -title: '' -labels: '' -assignees: '' - ---- - -碰到问题，请在 搜索是否存在相似的 issue。 - -不按照模板提交的 issue，会被系统自动删除。 - -### 基本信息 - -- ruoyi-vue-pro 版本： -- 操作系统： -- 数据库： - -### 你猜测可能的原因 - -（必填）我花费了 2-4 小时自查，发现可能的原因是：xxxxxx - -### 复现步骤 - -第一步， - -第二步， - -第三步， - -### 报错信息 - -带上必要的截图 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 7c765927a7..0000000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - -on: - push: - branches: [ master ] - # pull_request: - # branches: [ master ] - -jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - java: [ '8', '11', '17' ] - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK ${{ matrix.Java }} - uses: actions/setup-java@v2 - with: - java-version: ${{ matrix.java }} - distribution: 'temurin' - cache: maven - - name: Build with Maven - run: mvn -B package --file pom.xml -Dmaven.test.skip=true diff --git a/.github/workflows/yudao-ui-admin.yml b/.github/workflows/yudao-ui-admin.yml deleted file mode 100644 index a42a8f61cd..0000000000 --- a/.github/workflows/yudao-ui-admin.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: yudao-ui-admin CI - -# 在master分支发生push事件时触发。 -on: - push: - branches: [ master ] - # pull_request: - # branches: [ master ] -env: # 设置环境变量 - TZ: Asia/Shanghai # 时区（设置时区可使页面中的`最近更新时间`使用时区时间） - WORK_DIR: yudao-ui-admin #工作目录 - -defaults: - run: - shell: bash - working-directory: yudao-ui-admin - -jobs: - build: # 自定义名称 - runs-on: ubuntu-latest # 运行在虚拟机环境ubuntu-latest - - strategy: - matrix: - node_version: [14.x, 16.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - name: Checkout # 步骤1 - uses: actions/checkout@v2 # 使用的动作。格式：userName/repoName。作用：检出仓库，获取源码。 官方actions库：https://github.com/actions - - - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.15.1 - - - name: Set node version to ${{ matrix.node_version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node_version }} - cache: "yarn" - cache-dependency-path: yudao-ui-admin/yarn.lock - - - name: Install deps - run: node --version && yarn --version && yarn install - - - name: Build - run: yarn build:prod - - # 查看 workflow 的文档来获取更多信息 - # @see https://github.com/crazy-max/ghaction-github-pages - diff --git a/pom.xml b/pom.xml index 3f19cfe42a..11f637a9be 100644 --- a/pom.xml +++ b/pom.xml @@ -16,13 +16,13 @@ yudao-module-system yudao-module-infra - - + yudao-module-bpm + yudao-module-report - - + yudao-module-crm + yudao-module-erp ${project.artifactId} diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml index bc850b5902..6c97dabf36 100644 --- a/yudao-server/pom.xml +++ b/yudao-server/pom.xml @@ -40,17 +40,17 @@ - - - - - + + cn.iocoder.boot + yudao-module-report-biz + ${revision} + - - - - - + + cn.iocoder.boot + yudao-module-bpm-biz + ${revision} + @@ -88,18 +88,18 @@ - - - - - + + cn.iocoder.boot + yudao-module-crm-biz + ${revision} + - - - - - + + cn.iocoder.boot + yudao-module-erp-biz + ${revision} + diff --git a/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/Student.java b/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/Student.java new file mode 100644 index 0000000000..5f9b87f759 --- /dev/null +++ b/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/Student.java @@ -0,0 +1,8 @@ +package cn.iocoder.yudao.server.controller; + +public class Student { + private String name; + public void readName(){ + System.out.println(name); + } +} diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 8e84eb762c..0a137554a2 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -47,30 +47,27 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例 - # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 - # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 - # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true;useUnicode=true;characterEncoding=utf-8 # SQLServer 连接的示例 - # url: jdbc:dm://127.0.0.1:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 - username: root - password: 123456 + name: besure_neimeng + url: jdbc:mysql://47.106.185.127:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 + username: besure_user1 + password: zpW5:,LGHACh # username: sa # SQL Server 连接的示例 # password: Yudao@2024 # SQL Server 连接的示例 # username: SYSDBA # DM 连接的示例 # password: SYSDBA001 # DM 连接的示例 - slave: # 模拟从库，可根据自己需要修改 - lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: 123456 +# slave: # 模拟从库，可根据自己需要修改 +# lazy: true # 开启懒加载，保证启动速度 +# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: root +# password: 123456 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 127.0.0.1 # 地址 + host: 47.106.185.127 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 -# password: dev # 密码，建议生产环境开启 + #password: bkcaydy8ydhZZnS2 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 ####################