Skip to content

W
wangxiaolu-link-report
提交 1900e00b authored 作者: 吕本才's avatar 吕本才 提交者： Coding
浏览文件
操作

Accept Merge Request #93: (qa -> main)

Merge Request: 第一次报表上线 Created By: @吕本才 Accepted By: @吕本才 URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-link-report/git/merge/93
上级 2c6e93e8 3189339a
隐藏空白字符变更
内嵌 并排
正在显示 包含 233 行增加 和 17 行删除
.gitignore
浏览文件 @ 1900e00b
target/ target/
!.mvn/wrapper/maven-wrapper.jar !.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
### IntelliJ IDEA ### ### STS ###
.idea/
*.iws
*.iml
*.ipr
### Eclipse ###
.apt_generated .apt_generated
.classpath .classpath
.factorypath .factorypath
...@@ -17,6 +12,14 @@ target/ ...@@ -17,6 +12,14 @@ target/
.settings .settings
.springBeans .springBeans
.sts4-cache .sts4-cache
.mvn
logs
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ### ### NetBeans ###
/nbproject/private/ /nbproject/private/
...@@ -31,5 +34,5 @@ build/ ...@@ -31,5 +34,5 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
### Mac OS ### mvnw
.DS_Store mvnw.cmd
Dockerfile 0 → 100644
浏览文件 @ 1900e00b
FROM openjdk:8
WORKDIR /link
ARG ACTIVE=abc
ADD ./target/wangxiaolu-link-report.jar /link/app.jar
#设置时区
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
# 定义容器启动命令ENTRYPOINT 和 CMD指令类似,都可以用于增加启动参数
ENTRYPOINT ["nohup","java", "-jar", "/link/app.jar"]
CMD ["--spring.profiles.active=${ACTIVE}"]
EXPOSE 9205
pom.xml
浏览文件 @ 1900e00b
...@@ -18,10 +18,7 @@ ...@@ -18,10 +18,7 @@
<artifactId>wangxiaolu-link-report</artifactId> <artifactId>wangxiaolu-link-report</artifactId>
<version>0.0.1</version> <version>0.0.1</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->
<dependency> <dependency>
...@@ -93,18 +90,46 @@ ...@@ -93,18 +90,46 @@
<dependency> <dependency>
<groupId>org.jeecgframework.jimureport</groupId> <groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId> <artifactId>jimureport-spring-boot-starter</artifactId>
<version>${jeccg.jimureport.version}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-nosql-starter</artifactId>
<version>${jeccg.jimureport.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
settings.xml 0 → 100644
浏览文件 @ 1900e00b
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<localRepository>/Library/apache-maven-3.8.6/repository</localRepository>
<mirrors>
<!-- <mirror>-->
<!-- <id>mirror</id>-->
<!-- <mirrorOf>!rdc-releases,!rdc-snapshots</mirrorOf>-->
<!-- <name>mirror</name>-->
<!-- <url>http://maven.aliyun.com/nexus/content/groups/public</url>-->
<!-- </mirror>-->
<mirror>
<id>nexus-tencentyun</id>
<!-- 此配置避免了本仓库制品的拉取流量被切换到腾讯云镜像源，保证您在使用镜像加速的同时可以从本仓库拉取制品 -->
<mirrorOf>!g-pkkp8204-wangxiaolu-sfa-maven</mirrorOf>
<name>Nexus tencentyun</name>
<url>http://mirrors.cloud.tencent.com/nexus/repository/maven-public/</url>
</mirror>
</mirrors>
<servers>
<server>
<id>rdc-releases</id>
<username>G8G0iR</username>
<password>Do1l7QXnPg</password>
</server>
<server>
<id>rdc-snapshots</id>
<username>G8G0iR</username>
<password>Do1l7QXnPg</password>
</server>
<server>
<id>g-pkkp8204-wangxiaolu-sfa-maven</id>
<username>liqiulin@wangxiaolu.com.cn</username>
<password>Wangxiaolu_lql123</password>
</server>
</servers>
<profiles>
<profile>
<id>nexus</id>
<repositories>
<repository>
<id>central</id>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>snapshots</id>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>rdc-releases</id>
<url>https://repo.rdc.aliyun.com/repository/35126-release-kef1BI/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>rdc-snapshots</id>
<url>https://repo.rdc.aliyun.com/repository/35126-snapshot-j8LEe7/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>rdc-releases</id>
<url>https://repo.rdc.aliyun.com/repository/35126-release-kef1BI/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>rdc-snapshots</id>
<url>https://repo.rdc.aliyun.com/repository/35126-snapshot-j8LEe7/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>Repository Proxy</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>g-pkkp8204-wangxiaolu-sfa-maven</id>
<name>maven</name>
<url>https://g-pkkp8204-maven.pkg.coding.net/repository/wangxiaolu-sfa/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>nexus</activeProfile>
</activeProfiles>
</settings>
\ No newline at end of file
src/main/java/com/link/report/service/impl/JimuReportTokenServiceImpl.java
浏览文件 @ 1900e00b
package com.link.report.service.impl; package com.link.report.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.ServletUtils; import com.sfa.common.core.utils.ServletUtils;
import com.sfa.common.security.service.TokenService; import com.sfa.common.security.service.TokenService;
import com.sfa.common.security.utils.SecurityUtils; import com.sfa.common.security.utils.SecurityUtils;
...@@ -15,6 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -15,6 +14,7 @@ import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* @description: 自定义报表鉴权(如果不进行自定义, 则所有请求不做权限控制) * @description: 自定义报表鉴权(如果不进行自定义, 则所有请求不做权限控制)
...@@ -56,7 +56,9 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI { ...@@ -56,7 +56,9 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
@Override @Override
public String[] getRoles(String s) { public String[] getRoles(String s) {
return new String[0]; LoginUser loginUser = tokenService.getLoginUser(s);
Set<String> roles = loginUser.getRoles();
return roles.toArray(new String[0]);
} }
/** /**
...@@ -73,7 +75,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI { ...@@ -73,7 +75,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
/** /**
* 自定义请求头 * 自定义请求头
*/ */
@Override @Override
public HttpHeaders customApiHeader() { public HttpHeaders customApiHeader() {
...@@ -84,6 +86,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI { ...@@ -84,6 +86,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
/** /**
* 获取多租户id * 获取多租户id
*
* @return tenantId * @return tenantId
*/ */
public String getTenantId() { public String getTenantId() {
...@@ -114,7 +117,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI { ...@@ -114,7 +117,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
LoginUser loginUser = tokenService.getLoginUser(token); LoginUser loginUser = tokenService.getLoginUser(token);
map.put("sysUserCode", loginUser.getUsername()); map.put("sysUserCode", loginUser.getUsername());
//设置当前日期（年月日） //设置当前日期（年月日）
map.put("sysData", DateUtils.getDate()); map.put("sysData", DateUtil.date());
//设置昨天日期（年月日） //设置昨天日期（年月日）
map.put("sysYesterDay", DateUtil.yesterday()); map.put("sysYesterDay", DateUtil.yesterday());
//设置当前登录用户昵称 //设置当前登录用户昵称
...@@ -126,4 +129,14 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI { ...@@ -126,4 +129,14 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
map.put("describe", loginUser.getSysUser().getDept().getRemark()); map.put("describe", loginUser.getSysUser().getDept().getRemark());
return map; return map;
} }
public String[] getPermissions(String token) {
LoginUser loginUser = tokenService.getLoginUser(token);
if (loginUser == null) {
return new String[0];
}
return loginUser.getPermissions().toArray(new String[0]);
}
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论