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 @@ ${linkage.version} compile + + com.jnpf + linkage-demo + ${linkage.version} + compile + + 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 @@ io.swagger swagger-annotations + + 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(); + } /**