RuoYi
2020-11-20 1abf802a09cb054f6dd517d0e05062766c148c25
若依 2.3.0
1 files renamed
21 files modified
68 ■■■■■ changed files
pom.xml 4 ●●●● patch | view | raw | blame | history
ruoyi-api/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-api/ruoyi-api-system/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-auth/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-core/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-datascope/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-log/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-redis/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-security/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-swagger/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-gateway/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-file/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-gen/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-job/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-system/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-ui/package.json 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/index.vue 24 ●●●●● patch | view | raw | blame | history
ruoyi-visual/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-visual/ruoyi-monitor/pom.xml 2 ●●● patch | view | raw | blame | history
sql/ry_config_20201120.sql 2 ●●● patch | view | raw | blame | history
pom.xml
@@ -6,14 +6,14 @@
    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi</artifactId>
    <version>2.2.0</version>
    <version>2.3.0</version>
    <name>ruoyi</name>
    <url>http://www.ruoyi.vip</url>
    <description>若依微服务系统</description>
    <properties>
        <ruoyi.version>2.2.0</ruoyi.version>
        <ruoyi.version>2.3.0</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-api/ruoyi-api-system/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-api</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-common/ruoyi-common-core/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-common/ruoyi-common-datascope/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-common/ruoyi-common-log/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-common/ruoyi-common-redis/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-modules/ruoyi-file/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-modules/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-modules/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
  "name": "ruoyi",
  "version": "2.2.0",
  "version": "2.3.0",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
ruoyi-ui/src/views/index.vue
@@ -149,6 +149,28 @@
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
            <el-collapse-item title="v2.3.0 - 2020-11-20">
              <ol>
                <li>新增文件服务应用(支持本地、FastDFS)</li>
                <li>优化头像样式,鼠标移入悬停遮罩</li>
                <li>AjaxResult重写put方法,以方便链式调用</li>
                <li>代码生成支持上传控件</li>
                <li>新增图片上传组件</li>
                <li>支持用户头像更新</li>
                <li>调整默认首页</li>
                <li>角色权限验证hasRole匹配改为equals</li>
                <li>修正数组权限为空判断</li>
                <li>修正注释选中节点和半选节点获取</li>
                <li>升级pagehelper到最新版1.3.0</li>
                <li>升级fastjson到最新版1.2.74</li>
                <li>修正定时任务执行一次权限标识</li>
                <li>修复页签关闭所有固定标签路由不刷新问题</li>
                <li>表单构建布局型组件新增按钮</li>
                <li>调整日志路径到模块目录</li>
                <li>修正菜单提示信息错误</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v2.2.0 - 2020-10-10">
              <ol>
                <li>移除 OAuth2 改为 Redis</li>
@@ -335,7 +357,7 @@
  data() {
    return {
      // 版本号
      version: "2.2.0",
      version: "2.3.0",
    };
  },
  methods: {
ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
ruoyi-visual/ruoyi-monitor/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
        <version>2.2.0</version>
        <version>2.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
sql/ry_config_20201120.sql
File was renamed from sql/ry_config_20201118.sql
@@ -39,7 +39,7 @@
(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# Spring\r\nspring: \r\n  redis:\r\n    host: localhost\r\n    port: 6379\r\n    password: \r\n  datasource:\r\n    driver-class-name: com.mysql.cj.jdbc.Driver\r\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n    username: root\r\n    password: password\r\n\r\n# Mybatis配置\r\nmybatis:\r\n    # 搜索指定包别名\r\n    typeAliasesPackage: com.ruoyi.system\r\n    # 配置mapper的扫描,找到所有的mapper.xml映射文件\r\n    mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger 配置\r\nswagger:\r\n  title: 系统模块接口文档\r\n  license: Powered By ruoyi\r\n  licenseUrl: https://ruoyi.vip\r\n  authorization:\r\n    name: RuoYi OAuth\r\n    auth-regex: ^.*$\r\n    authorization-scope-list:\r\n      - scope: server\r\n        description: 客户端授权范围\r\n    token-url-list:\r\n      - http://localhost:8080/auth/oauth/token\r\n','06f95c879d284ec8031cc44805e62b50','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'),
(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# Spring\r\nspring: \r\n  redis:\r\n    host: localhost\r\n    port: 6379\r\n    password: \r\n  datasource: \r\n    driver-class-name: com.mysql.cj.jdbc.Driver\r\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n    username: root\r\n    password: password\r\n\r\n# Mybatis配置\r\nmybatis:\r\n    # 搜索指定包别名\r\n    typeAliasesPackage: com.ruoyi.gen.domain\r\n    # 配置mapper的扫描,找到所有的mapper.xml映射文件\r\n    mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger 配置\r\nswagger:\r\n  title: 代码生成接口文档\r\n  license: Powered By ruoyi\r\n  licenseUrl: https://ruoyi.vip\r\n  authorization:\r\n    name: RuoYi OAuth\r\n    auth-regex: ^.*$\r\n    authorization-scope-list:\r\n      - scope: server\r\n        description: 客户端授权范围\r\n    token-url-list:\r\n      - http://localhost:8080/auth/oauth/token\r\n\r\n# 代码生成\r\ngen: \r\n  # 作者\r\n  author: ruoyi\r\n  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\r\n  packageName: com.ruoyi.system\r\n  # 自动去除表前缀,默认是false\r\n  autoRemovePre: false\r\n  # 表前缀(生成类名不会包含表前缀,多个用逗号分隔)\r\n  tablePrefix: sys_\r\n','02b9be6ad01ca44c992c41a020ec81aa','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','null'),
(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# Spring\r\nspring: \r\n  redis:\r\n    host: localhost\r\n    port: 6379\r\n    password: \r\n  datasource:\r\n    driver-class-name: com.mysql.cj.jdbc.Driver\r\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n    username: root\r\n    password: password\r\n\r\n# Mybatis配置\r\nmybatis:\r\n    # 搜索指定包别名\r\n    typeAliasesPackage: com.ruoyi.job.domain\r\n    # 配置mapper的扫描,找到所有的mapper.xml映射文件\r\n    mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger 配置\r\nswagger:\r\n  title: 定时任务接口文档\r\n  license: Powered By ruoyi\r\n  licenseUrl: https://ruoyi.vip\r\n  authorization:\r\n    name: RuoYi OAuth\r\n    auth-regex: ^.*$\r\n    authorization-scope-list:\r\n      - scope: server\r\n        description: 客户端授权范围\r\n    token-url-list:\r\n      - http://localhost:8080/auth/oauth/token\r\n','5033cbfb2c38780ac23f74954588ec4f','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','null'),
(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','## 本地文件上传    \r\nfile:\r\n    domain: http://127.0.0.1:9300\r\n    path: D:/ruoyi/uploadPath\r\n    prefix: /statics','df392a1e74e856a6218f4110a4f18700','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','null'),
(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','## 本地文件上传    \r\nfile:\r\n    domain: http://127.0.0.1:9300\r\n    path: D:/ruoyi/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://127.0.0.1\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 127.0.0.1:22122','683f4f682d8d7a6df803b0f6823e6db5','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','null'),
(9,'sentinel-ruoyi-gateway','DEFAULT_GROUP','[\r\n    {\r\n        \"resource\": \"ruoyi-auth\",\r\n        \"count\": 500,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n    {\r\n        \"resource\": \"ruoyi-system\",\r\n        \"count\": 1000,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n    {\r\n        \"resource\": \"ruoyi-gen\",\r\n        \"count\": 200,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n    {\r\n        \"resource\": \"ruoyi-job\",\r\n        \"count\": 300,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json','null');