🎉 2.8.0.RELEASE 新增在线报表模块

This commit is contained in:
smallchill 2020-11-14 20:43:29 +08:00
parent 503c853062
commit 16cb17e6a2
61 changed files with 575 additions and 315 deletions

View File

@ -1,9 +1,9 @@
<p align="center"> <p align="center">
<img src="https://img.shields.io/badge/Release-V2.7.3-green.svg" alt="Downloads"> <img src="https://img.shields.io/badge/Release-V2.8.0-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status"> <img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status"> <img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR8-blue.svg" alt="Coverage Status"> <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR8-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.2.9.RELEASE-blue.svg" alt="Downloads"> <img src="https://img.shields.io/badge/Spring%20Boot-2.2.11.RELEASE-blue.svg" alt="Downloads">
<a target="_blank" href="https://bladex.vip"> <a target="_blank" href="https://bladex.vip">
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads"> <img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
</a> </a>

View File

@ -8,7 +8,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<artifactId>blade-auth</artifactId> <artifactId>blade-auth</artifactId>

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package org.springblade.auth.granter; package org.springblade.auth.granter;

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -80,8 +80,13 @@
<!-- JWT --> <!-- JWT -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt-impl</artifactId>
<version>0.9.1</version> <version>0.11.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.11.2</version>
</dependency> </dependency>
<!--Swagger--> <!--Swagger-->
<dependency> <dependency>

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package org.springblade.gateway.props; package org.springblade.gateway.props;

View File

@ -38,7 +38,6 @@ public class AuthProvider {
defaultSkipUrl.add("/captcha/**"); defaultSkipUrl.add("/captcha/**");
defaultSkipUrl.add("/actuator/health/**"); defaultSkipUrl.add("/actuator/health/**");
defaultSkipUrl.add("/v2/api-docs/**"); defaultSkipUrl.add("/v2/api-docs/**");
defaultSkipUrl.add("/v2/api-docs-ext/**");
defaultSkipUrl.add("/auth/**"); defaultSkipUrl.add("/auth/**");
defaultSkipUrl.add("/oauth/**"); defaultSkipUrl.add("/oauth/**");
defaultSkipUrl.add("/log/**"); defaultSkipUrl.add("/log/**");

View File

@ -36,7 +36,7 @@ import java.util.List;
@Component @Component
@AllArgsConstructor @AllArgsConstructor
public class SwaggerProvider implements SwaggerResourcesProvider { public class SwaggerProvider implements SwaggerResourcesProvider {
private static final String API_URI = "/v2/api-docs-ext"; private static final String API_URI = "/v2/api-docs";
private RouteProperties routeProperties; private RouteProperties routeProperties;

View File

@ -60,8 +60,8 @@ public class JwtUtil {
*/ */
public static Claims parseJWT(String jsonWebToken) { public static Claims parseJWT(String jsonWebToken) {
try { try {
return Jwts.parser() return Jwts.parserBuilder()
.setSigningKey(Base64.getDecoder().decode(JwtUtil.BASE64_SECURITY)) .setSigningKey(Base64.getDecoder().decode(JwtUtil.BASE64_SECURITY)).build()
.parseClaimsJws(jsonWebToken).getBody(); .parseClaimsJws(jsonWebToken).getBody();
} catch (Exception ex) { } catch (Exception ex) {
return null; return null;

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -0,0 +1,15 @@
FROM anapsix/alpine-java:8_server-jre_unlimited
MAINTAINER smallchill@163.com
RUN mkdir -p /blade/report
WORKDIR /blade/report
EXPOSE 8108
ADD ./target/blade-report.jar ./app.jar
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
CMD ["--spring.profiles.active=test"]

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>2.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-report</artifactId>
<name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging>
<dependencies>
<!--Blade-->
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-report</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,34 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.report;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.cloud.client.SpringCloudApplication;
/**
* UReport启动器
*
* @author Chill
*/
@SpringCloudApplication
public class ReportApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_REPORT_NAME, ReportApplication.class, args);
}
}

View File

@ -0,0 +1,42 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.report.config;
import org.springblade.core.report.datasource.ReportDataSource;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import javax.sql.DataSource;
/**
* 报表配置类
*
* @author Chill
*/
@Configuration
@ConditionalOnProperty(value = "report.enabled", havingValue = "true", matchIfMissing = true)
public class BladeReportConfiguration {
/**
* 自定义报表可选数据源
*/
@Bean
public ReportDataSource reportDataSource(DataSource dataSource) {
return new ReportDataSource(dataSource);
}
}

View File

@ -0,0 +1,6 @@
#数据源配置
spring:
datasource:
url: ${blade.datasource.dev.url}
username: ${blade.datasource.dev.username}
password: ${blade.datasource.dev.password}

View File

@ -0,0 +1,6 @@
#数据源配置
spring:
datasource:
url: ${blade.datasource.prod.url}
username: ${blade.datasource.prod.username}
password: ${blade.datasource.prod.password}

View File

@ -0,0 +1,6 @@
#数据源配置
spring:
datasource:
url: ${blade.datasource.test.url}
username: ${blade.datasource.test.username}
password: ${blade.datasource.test.password}

View File

@ -0,0 +1,10 @@
#服务器端口
server:
port: 8108
#报表配置
report:
enabled: true
database:
provider:
prefix: blade-

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -14,6 +14,7 @@
<modules> <modules>
<module>blade-admin</module> <module>blade-admin</module>
<module>blade-develop</module> <module>blade-develop</module>
<module>blade-report</module>
<module>blade-resource</module> <module>blade-resource</module>
<module>blade-seata-order</module> <module>blade-seata-order</module>
<module>blade-seata-storage</module> <module>blade-seata-storage</module>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.entity; package com.example.demo.entity;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.feign; package com.example.demo.feign;

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package org.springblade.system.entity; package org.springblade.system.entity;

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.7.3</version> <version>2.8.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description> <description>SpringBlade 微服务API集合</description>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo; package com.example.demo;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.config; package com.example.demo.config;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.controller; package com.example.demo.controller;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.controller; package com.example.demo.controller;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.controller; package com.example.demo.controller;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.feign; package com.example.demo.feign;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.launcher; package com.example.demo.launcher;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.mapper; package com.example.demo.mapper;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.service; package com.example.demo.service;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.service; package com.example.demo.service;

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package com.example.demo.service.impl; package com.example.demo.service.impl;

View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -26,6 +26,7 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.system.entity.Post; import org.springblade.system.entity.Post;
@ -111,6 +112,7 @@ public class PostController extends BladeController {
@ApiOperationSupport(order = 6) @ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入post") @ApiOperation(value = "新增或修改", notes = "传入post")
public R submit(@Valid @RequestBody Post post) { public R submit(@Valid @RequestBody Post post) {
post.setTenantId(SecureUtil.getTenantId());
return R.status(postService.saveOrUpdate(post)); return R.status(postService.saveOrUpdate(post));
} }

View File

@ -30,9 +30,9 @@ import org.springblade.system.entity.Post;
import org.springblade.system.entity.Role; import org.springblade.system.entity.Role;
import org.springblade.system.entity.Tenant; import org.springblade.system.entity.Tenant;
import org.springblade.system.mapper.DeptMapper; import org.springblade.system.mapper.DeptMapper;
import org.springblade.system.mapper.PostMapper;
import org.springblade.system.mapper.RoleMapper; import org.springblade.system.mapper.RoleMapper;
import org.springblade.system.mapper.TenantMapper; import org.springblade.system.mapper.TenantMapper;
import org.springblade.system.service.IPostService;
import org.springblade.system.service.ITenantService; import org.springblade.system.service.ITenantService;
import org.springblade.system.user.entity.User; import org.springblade.system.user.entity.User;
import org.springblade.system.user.feign.IUserClient; import org.springblade.system.user.feign.IUserClient;
@ -55,7 +55,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
private final TenantId tenantId; private final TenantId tenantId;
private final RoleMapper roleMapper; private final RoleMapper roleMapper;
private final DeptMapper deptMapper; private final DeptMapper deptMapper;
private final PostMapper postMapper; private final IPostService postService;
private final IUserClient userClient; private final IUserClient userClient;
@Override @Override
@ -101,7 +101,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
post.setPostCode("ceo"); post.setPostCode("ceo");
post.setPostName("首席执行官"); post.setPostName("首席执行官");
post.setSort(1); post.setSort(1);
postMapper.insert(post); postService.save(post);
// 新建租户对应的默认管理用户 // 新建租户对应的默认管理用户
User user = new User(); User user = new User();
user.setTenantId(tenantId); user.setTenantId(tenantId);

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -1,18 +1,17 @@
/* /**
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* * <p>
* Redistribution and use in source and binary forms, with or without * Licensed under the Apache License, Version 2.0 (the "License");
* modification, are permitted provided that the following conditions are met: * you may not use this file except in compliance with the License.
* * You may obtain a copy of the License at
* Redistributions of source code must retain the above copyright notice, * <p>
* this list of conditions and the following disclaimer. * http://www.apache.org/licenses/LICENSE-2.0
* Redistributions in binary form must reproduce the above copyright * <p>
* notice, this list of conditions and the following disclaimer in the * Unless required by applicable law or agreed to in writing, software
* documentation and/or other materials provided with the distribution. * distributed under the License is distributed on an "AS IS" BASIS,
* Neither the name of the dreamlu.net developer nor the names of its * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* contributors may be used to endorse or promote products derived from * See the License for the specific language governing permissions and
* this software without specific prior written permission. * limitations under the License.
* Author: Chill 庄骞 (smallchill@163.com)
*/ */
package org.springblade.system.user.excel; package org.springblade.system.user.excel;

View File

@ -7,12 +7,12 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<version>2.7.3</version> <version>2.8.0</version>
</parent> </parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.7.3</version> <version>2.8.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>SpringBlade 微服务集合</description> <description>SpringBlade 微服务集合</description>

View File

@ -67,6 +67,26 @@ management:
health: health:
show-details: always show-details: always
#knife4j配置
knife4j:
#启用
enable: true
#基础认证
basic:
enable: false
username: blade
password: blade
#增强配置
setting:
enableSwaggerModels: true
enableDocumentManage: true
enableHost: false
enableHostText: http://localhost
enableRequestCache: true
enableFilterMultipartApis: false
enableFilterMultipartApiMethodType: POST
language: zh-CN
#blade配置 #blade配置
blade: blade:
xss: xss:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,2 +0,0 @@
ALTER TABLE `blade_tenant`
ADD COLUMN `domain` varchar(255) NULL COMMENT '域名地址' AFTER `tenant_name`;

View File

@ -0,0 +1,32 @@
-- ----------------------------
-- 报表文件表
-- ----------------------------
CREATE TABLE `blade_report_file` (
`id` bigint(64) NOT NULL COMMENT '主键',
`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文件名',
`content` mediumblob NULL COMMENT '文件内容',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`)
) COMMENT = '报表文件表';
-- ----------------------------
-- 插入报表文件表菜单数据
-- ----------------------------
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1164733399669962301', '0', 'report', '报表管理', 'menu', '/report', 'iconfont icon-shujuzhanshi2', 5, 1, 0, 1, NULL, 0);
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1164733399669962302', '1164733399669962301', 'report_setting', '报表配置', 'menu', 'http://localhost:8108/ureport/designer', 'iconfont icon-rizhi', 1, 1, 0, 1, NULL, 0);
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1164733399669962303', '1164733399669962301', 'report_list', '报表列表', 'menu', '/report/reportlist', 'iconfont icon-biaodan', 2, 1, 0, 1, NULL, 0);
-- ----------------------------
-- 增加报表文件表菜单权限数据
-- ----------------------------
INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`)
VALUES ('1161272893875228001', '1164733399669962301', '1123598816738675201');
INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`)
VALUES ('1161272893875228002', '1164733399669962302', '1123598816738675201');
INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`)
VALUES ('1161272893875228003', '1164733399669962303', '1123598816738675201');

34
pom.xml
View File

@ -5,28 +5,30 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<version>2.7.3</version> <version>2.8.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<blade.tool.version>2.7.3</blade.tool.version> <blade.tool.version>2.8.0</blade.tool.version>
<blade.project.version>2.7.3</blade.project.version> <blade.project.version>2.8.0</blade.project.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.plugin.version>3.8.1</maven.plugin.version> <maven.plugin.version>3.8.1</maven.plugin.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.10.5</swagger.version>
<swagger.models.version>1.5.21</swagger.models.version> <swagger.models.version>1.6.2</swagger.models.version>
<knife4j.version>2.0.4</knife4j.version> <spring.plugin.version>2.2.0.RELEASE</spring.plugin.version>
<mybatis.plus.version>3.3.2</mybatis.plus.version> <knife4j.version>2.0.6</knife4j.version>
<mybatis.plus.version>3.4.0</mybatis.plus.version>
<protostuff.version>1.6.0</protostuff.version> <protostuff.version>1.6.0</protostuff.version>
<captcha.version>1.6.2</captcha.version> <captcha.version>1.6.2</captcha.version>
<easyexcel.version>2.2.6</easyexcel.version> <easyexcel.version>2.2.6</easyexcel.version>
<mica.auto.version>1.1.0</mica.auto.version> <mica.auto.version>1.2.5</mica.auto.version>
<alibaba.cloud.version>2.2.1.RELEASE</alibaba.cloud.version> <alibaba.cloud.version>2.2.3.RELEASE</alibaba.cloud.version>
<spring.boot.admin.version>2.3.0</spring.boot.admin.version> <spring.boot.admin.version>2.3.0</spring.boot.admin.version>
<spring.plugin.version>2.0.0.RELEASE</spring.plugin.version>
<spring.boot.version>2.2.9.RELEASE</spring.boot.version> <spring.boot.version>2.2.11.RELEASE</spring.boot.version>
<spring.cloud.version>Hoxton.SR7</spring.cloud.version> <spring.cloud.version>Hoxton.SR8</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version> <spring.platform.version>Cairo-SR8</spring.platform.version>
<!-- 推荐使用Harbor --> <!-- 推荐使用Harbor -->
@ -46,6 +48,16 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>${spring.plugin.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-metadata</artifactId>
<version>${spring.plugin.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>

View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade REGISTER=192.168.0.157/blade
TAG=2.7.3 TAG=2.8.0

View File

@ -112,6 +112,14 @@ services:
blade_net: blade_net:
ipv4_address: 172.30.0.92 ipv4_address: 172.30.0.92
blade-report:
image: "${REGISTER}/blade/blade-report:${TAG}"
privileged: true
restart: always
networks:
blade_net:
ipv4_address: 172.30.0.98
blade-log: blade-log:
image: "${REGISTER}/blade/blade-log:${TAG}" image: "${REGISTER}/blade/blade-log:${TAG}"
privileged: true privileged: true

View File

@ -36,8 +36,12 @@ http {
} }
upstream auth { upstream auth {
server 172.30.0.91; server 172.30.0.91:8100;
server 172.30.0.92; server 172.30.0.92:8100;
}
upstream report {
server 172.30.0.98:8018;
} }
server { server {
@ -64,4 +68,16 @@ http {
} }
} }
server {
listen 8108;
server_name report;
location / {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_buffering off;
proxy_pass http://report;
}
}
} }