Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository:5118234/APIJSON.NET
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base:master
Choose a base ref
...
head repository:liaozb/APIJSON.NET
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare:master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 51 files changed
  • 5 contributors

Commits on Jul 18, 2019

  1. sqlSugarCore升级到5.0.9

    @haptear
    haptear committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    dab0e09View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Merge branch 'master' ofhttps://github.com/liaozb/APIJSON.NET

    # Conflicts: # APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj 0.0.7 修复not in的缺陷，增加~ 不等于的支持
    @haptear
    haptear committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    f67884eView commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. 0.0.8 清理SelectTable 支持重载

    @haptear
    haptear committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    f64c5bcView commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. #升级到.netcore3.1#

    @liaozb
    liaozb committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    ef21335View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. #修复错误#

    @liaozb
    liaozb committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    20851c5View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. 处理别名如果为关键字的缺陷

    @haptear
    haptear committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    42db861View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' ofhttps://github.com/liaozb/APIJSON.NET

    # Conflicts: # APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj # APIJSON.NET/APIJSONCommon/SelectTable.cs
    @haptear
    haptear committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    f7584dcView commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. 移除多余nuget包，添加跨域配置化，配置JSON.NET修复JObject报错

    刘俊繁 committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    d589661View commit details
    Browse the repository at this point in the history

  2. Merge pull requestliaozb#22from fanslead/master

    移除多余nuget包，添加跨域配置化，配置JSON.NET修复JObject报错
    @liaozb
    liaozb authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    0525f90View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. Bump Microsoft.AspNetCore.Authentication.JwtBearer

    Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.18. - [Release notes](https://github.com/aspnet/AspNetCore/releases) - [Commits](dotnet/aspnetcore@v3.1.9...v3.1.18) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Aug 25, 2021
    Configuration menu
    Copy the full SHA
    f4c72dbView commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. Merge branch 'master' ofhttps://github.com/liaozb/APIJSON.NET

    @haptear
    haptear committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    75101d6View commit details
    Browse the repository at this point in the history

  2. 升级sqlSugarCore版本 解决如果查找字段是关键字(例如:key)时出错的问题

    处理启动后显示404无网页的问题
    @haptear
    haptear committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    2edec64View commit details
    Browse the repository at this point in the history

  3. Merge pull requestliaozb#26from haptear/master

    升级sqlSugarCore版本 处理启动后显示404无网页的问题
    @liaozb
    liaozb authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    a133493View commit details
    Browse the repository at this point in the history

  4. Merge pull requestliaozb#25from liaozb/dependabot/nuget/APIJSON.NET…

    …/APIJSON.NET/Microsoft.AspNetCore.Authentication.JwtBearer-3.1.18 Bump Microsoft.AspNetCore.Authentication.JwtBearer from 3.1.9 to 3.1.18 in /APIJSON.NET/APIJSON.NET
    @liaozb
    liaozb authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    717fbb7View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. #升级到.net6.0#

    @liaozb
    liaozb committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    1a65cf3View commit details
    Browse the repository at this point in the history

  2. #乱码修复#

    @liaozb
    liaozb committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    f80ed27View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2022

  1. #运行错误修复#

    @liaozb
    liaozb committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    bd1f3dbView commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. #升级到.NET8#

    @liaozb
    liaozb committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    462977aView commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. 不对函数加``,解决sum(*),Count(1)等不能使用的问题

    @390620652
    390620652 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    850afe0View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge pull requestliaozb#34from 390620652/dev

    不对函数加``,解决sum(*),Count(1)等不能使用的问题
    @liaozb
    liaozb authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    51c66acView commit details
    Browse the repository at this point in the history
Loading