Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

同步主干分支版本代码，并升级jedis至3.8.0 #5782

Merged
merged 38 commits into from
Jan 12, 2024
Merged

同步主干分支版本代码，并升级jedis至3.8.0 #5782

merged 38 commits into from
Jan 12, 2024

Commits on Dec 19, 2023

  1. fix issues #5658 树表复选框与展开按钮重叠问题

    chenrui committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    5a3631c View commit details
    Browse the repository at this point in the history

  2. fix QQYUN-7583 Vue3风格表单页面多选控件渲染成了下拉多选

    chenrui committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    82d051f View commit details
    Browse the repository at this point in the history

  3. fix QQYUN-7527 vue3代码生成,默认带上高级查询

    chenrui committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    090f790 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. fix issue vue3 #939

    chenrui committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    cdbe1cb View commit details
    Browse the repository at this point in the history

  2. fix issue vue3 #939: modify file suffix

    chenrui committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    7ae6a11 View commit details
    Browse the repository at this point in the history

  3. Merge pull request jeecgboot#5706 from hoperunChen/fix-issue-vue3-#939 

    fix issue vue3 #939 npm run build 失败
    @zhangdaiscott
    zhangdaiscott committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    338902c View commit details
    Browse the repository at this point in the history

  4. SpringBoot3+JDK17版本可以下载了

    @zhangdaiscott
    zhangdaiscott committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    d080b0b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git

    @zhangdaiscott
    zhangdaiscott committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    98facdd View commit details
    Browse the repository at this point in the history

  6. 还原错误提交

    @zhangdaiscott
    zhangdaiscott committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    a82213b View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2023

  1. 补充信息

    @zhangdaiscott
    zhangdaiscott committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    c36ece8 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Merge pull request jeecgboot#5690 from hoperunChen/fix-issues-#5658 

    fix issues #5658 树表复选框与展开按钮重叠问题
    @zhangdaiscott
    zhangdaiscott committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    8836a27 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jeecgboot#5691 from hoperunChen/Fix-QQYUN-7583 

    fix QQYUN-7583 Vue3风格表单页面多选控件渲染成了下拉多选
    @zhangdaiscott
    zhangdaiscott committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    6d10949 View commit details
    Browse the repository at this point in the history

  3. 提交online新依赖（解决online接口安全漏洞问题）

    @zhangdaiscott
    zhangdaiscott committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    09f92f0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git

    @zhangdaiscott
    zhangdaiscott committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    cfeb81e View commit details
    Browse the repository at this point in the history

  5. Merge pull request jeecgboot#5692 from hoperunChen/fix-QQYUN-7527 

    fix QQYUN-7527 vue3代码生成默认带上高级查询
    @zhangdaiscott
    zhangdaiscott committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    337d5a9 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. 小功能修改

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    69287a7 View commit details
    Browse the repository at this point in the history

  2. 租户改造

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    48b0b60 View commit details
    Browse the repository at this point in the history

  3. 加权限注解

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    43593e8 View commit details
    Browse the repository at this point in the history

  4. 企业微信集成改造

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    7f0c035 View commit details
    Browse the repository at this point in the history

  5. 通知公告

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    de3285d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    4c54ff6 View commit details
    Browse the repository at this point in the history

  7. 代码生成器更新

    @zhangdaiscott
    zhangdaiscott committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    fdde84c View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. 提供新版仪表盘

    @zhangdaiscott
    zhangdaiscott committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    5034b7c View commit details
    Browse the repository at this point in the history

  2. 删除无用代码

    @zhangdaiscott
    zhangdaiscott committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    cd9794d View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. 新版数据库，有新升级sql和权限授权配置

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    d962c34 View commit details
    Browse the repository at this point in the history

  2. 2024年首版本发布（仪表盘大升级）

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    dff8c84 View commit details
    Browse the repository at this point in the history

  3. 2024年首版本发布（仪表盘大升级）

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    1876545 View commit details
    Browse the repository at this point in the history

  4. 日志暂时不做权限控制

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    7e39b31 View commit details
    Browse the repository at this point in the history

  5. 升级新版本号3.6.2

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    169a66f View commit details
    Browse the repository at this point in the history

  6. 3.6.2版本对应的数据库脚本

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    e0ef20c View commit details
    Browse the repository at this point in the history

  7. 2024年首版本发布（antd4和仪表盘大升级）

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    aeaac80 View commit details
    Browse the repository at this point in the history

  8. 从3.6.2+版本增加flyway自动升级数据库机制

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    b86b4d9 View commit details
    Browse the repository at this point in the history

  9. 从3.6.2+版本增加flyway自动升级数据库机制

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    79a62aa View commit details
    Browse the repository at this point in the history

  10. 2024年首版本发布（antd4和仪表盘大升级）

    @zhangdaiscott
    zhangdaiscott committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    041d881 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. 默认删除人大金仓依赖，需要请自己放开

    @zhangdaiscott
    zhangdaiscott committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    0bd7f71 View commit details
    Browse the repository at this point in the history

  2. 从3.6.2+版本增加flyway自动升级数据库机制

    @zhangdaiscott
    zhangdaiscott committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    6fe8f1d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Merge branch 'master' into springboot3 

    # Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
#	jeecg-module-system/jeecg-system-biz/pom.xml
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java
#	jeecg-module-system/jeecg-system-start/pom.xml
#	jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
#	pom.xml
    @EightMonth
    EightMonth committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    cdea05e View commit details
    Browse the repository at this point in the history

  2. 升级jedis版本至3.8.0

    @EightMonth
    EightMonth committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    c5d620d View commit details
    Browse the repository at this point in the history