Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

whywhyo

2023-10-10 835744df0cd64f0924f49a102eb58e8373b68484

Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -15,4 +15,7 @@
    public static void main(String[] args) {
        SpringApplication.run(RuoYiApplication.class, args);
    }
    //SpringBoot-v2.0+配置方式


}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java

@@ -43,7 +43,7 @@
    /**
     * 根据条件查看权限
     */
    @GetMapping("/condition")
    @PostMapping("/condition")
    public AjaxResult getAuthorityByCondition(@RequestBody AuthorityDto authorityDto){
        return AjaxResult.success(zAuthorityService.getByCondition(authorityDto));
    }

 ruoyi-admin/src/main/resources/application.yml

@@ -19,6 +19,14 @@
server:
  # 服务器的HTTP端口，默认为8080
  port: 8080
  ssl: #ssl配置
    # resources根目录的”证书源文件.pfx“
    key-store: www.bendudu.com.pfx
    # “.pfx”证书对应格式，“.jks"证书对应“RSA”
    key-store-type: PKCS12
    key-store-password: tc6h7mav
    #key-password: 私钥密码

  servlet:
    # 应用的访问路径
    context-path: /

 ruoyi-admin/src/main/resources/www.bendudu.com.pfx

Binary files differ