From 7fb953edbf7b6c9399d81d297dda1e321df0fc73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Tue, 6 Dec 2022 14:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=90=8E=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-boot/linkage-admin/pom.xml                              | 7 +++++++
 .../src/main/java/jnpf/LinkageAdminApplication.java        | 3 +++
 .../linkage-admin/src/main/resources/application-dev.yml   | 4 ++--
 SC-boot/linkage-demo/pom.xml                               | 6 ++++++
 .../src/main/java/jnpf/config/SecurityConfig.java          | 4 +++-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/SC-boot/linkage-admin/pom.xml b/SC-boot/linkage-admin/pom.xml
index 1eb9caa1..b950d035 100644
--- a/SC-boot/linkage-admin/pom.xml
+++ b/SC-boot/linkage-admin/pom.xml
@@ -85,8 +85,15 @@
             <version>${linkage.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.jnpf</groupId>
+            <artifactId>linkage-demo</artifactId>
+            <version>${linkage.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <!-- ... -->
diff --git a/SC-boot/linkage-admin/src/main/java/jnpf/LinkageAdminApplication.java b/SC-boot/linkage-admin/src/main/java/jnpf/LinkageAdminApplication.java
index 2f71dc8f..31990dce 100644
--- a/SC-boot/linkage-admin/src/main/java/jnpf/LinkageAdminApplication.java
+++ b/SC-boot/linkage-admin/src/main/java/jnpf/LinkageAdminApplication.java
@@ -27,6 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
  * @date 2021/3/15 17:12
  */
 @SpringBootApplication(scanBasePackages = "jnpf",exclude={DataSourceAutoConfiguration.class})
+
+//@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = {"org.jeecg.modules.jmreport","jnpf"})
+
 public class LinkageAdminApplication extends SpringBootServletInitializer implements CommandLineRunner {
 
     public static void main(String[] args) {
diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
index 90d163ed..5b7c417b 100644
--- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml
+++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
@@ -59,9 +59,9 @@ config:
   #===================== 文件模板配置 =====================
   fileType: local #文件存储类型(local-本地存储，minio-网络存储)
   # win
-  Path: /usr/project/jnpf-resources/ #Windows配置（静态资源根目录和代码生成器临时目录）
+  Path: D:\project\jnpf-resources\    #Windows配置（静态资源根目录和代码生成器临时目录）
   # Linux
-  #Path: /data/jnpf-resources/ #Linux配置（静态资源根目录和代码生成器临时目录）
+  #Path: /usr/project/jnpf-resources/ #Linux配置（静态资源根目录和代码生成器临时目录）
   minio:
     endpoint: http://192.168.0.147:9000/ #服务端地址
     accessKey: minioadmin #账号
diff --git a/SC-boot/linkage-demo/pom.xml b/SC-boot/linkage-demo/pom.xml
index 5d13fd0b..8190ef2e 100644
--- a/SC-boot/linkage-demo/pom.xml
+++ b/SC-boot/linkage-demo/pom.xml
@@ -35,6 +35,12 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
+        <!-- JimuReport -->
+        <!--<dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>spring-boot-starter-jimureport</artifactId>
+            <version>1.3.21-beta</version>
+        </dependency>-->
     </dependencies>
 
 </project>
diff --git a/SC-boot/linkage-oauth/src/main/java/jnpf/config/SecurityConfig.java b/SC-boot/linkage-oauth/src/main/java/jnpf/config/SecurityConfig.java
index 09f75f53..294be1e1 100644
--- a/SC-boot/linkage-oauth/src/main/java/jnpf/config/SecurityConfig.java
+++ b/SC-boot/linkage-oauth/src/main/java/jnpf/config/SecurityConfig.java
@@ -38,7 +38,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         //解决iframe拒绝问题
         http.headers().frameOptions().disable();
         http.csrf().disable().authorizeRequests()
-                .antMatchers("/RSA/publicKey").permitAll();
+                .antMatchers("/RSA/publicKey").permitAll()
+                .antMatchers("/jmreport/**").anonymous();
+
     }
 
     /**