-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor-iteration-v2-without-block-chain merge to release (#133)
* refactor: 用户权限、身份、组关系重构 * refactor: 用户权限、身份、组关系重构,新增一些工具类 * refactor: 用户权限、身份、组关系重构,新增一些工具类 * refactor: 合并po与entity,复原删除的原始代码,优化项目包结构 * feat: 新增公告栏功能; perf: dc汇总表格新增两列. * feat: 新增实习期功能; perf: 优化公告栏功能. * docs: 新增测试sql脚本. * docs: 更新测试sql脚本. * fix: 改进实习申请添加逻辑. * fix: 修改po_entity类威entity. * fix: 修改po_entity类为entity. * fix: 修改Dockerfile. * fix: 修复绩效申请失效bug.
- Loading branch information
Showing
248 changed files
with
3,849 additions
and
736 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,34 @@ | ||
#FROM openjdk:11 | ||
#MAINTAINER LiXiaoKang 191250075@smail.nju.edu.cn | ||
#WORKDIR /ROOT | ||
#ADD ./target/dingtalk-0.0.1-SNAPSHOT.jar /ROOT/ | ||
#ENV LD_LIBRARY_PATH /usr/lib | ||
#ENV PROFILES="prod" | ||
#EXPOSE 8080 | ||
#ENTRYPOINT ["sh", "-c", "java -jar dingtalk-0.0.1-SNAPSHOT.jar --spring.profiles.active=$PROFILES"] | ||
|
||
# First stage: complete build environment | ||
FROM maven:3.6.3-jdk-11-slim AS builder | ||
WORKDIR /code | ||
COPY . /code | ||
# add pom.xml and source code | ||
ADD ./pom.xml /code/pom.xml | ||
ADD ./src /code/src | ||
# package jar | ||
COPY ./settings.xml /root/.m2/settings.xml | ||
RUN mvn package -DskipTests | ||
|
||
# Second stage: minimal runtime environment | ||
FROM openjdk:11 | ||
MAINTAINER zhanyeye zhanyeye@qq.com | ||
WORKDIR /ROOT | ||
ADD ./target/dingtalk-0.0.1-SNAPSHOT.jar /ROOT/ | ||
WORKDIR /app | ||
# Change TimeZone | ||
# RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone | ||
LABEL maintainer="191250075@smail.nju.edu.cn" | ||
# copy jar from the first stage | ||
COPY --from=builder /code/target/dingtalk-2.0.1-SNAPSHOT.jar /app/app.jar | ||
|
||
ENV LD_LIBRARY_PATH /usr/lib | ||
ENV PROFILES="prod" | ||
EXPOSE 8080 | ||
ENTRYPOINT ["sh", "-c", "java -jar dingtalk-0.0.1-SNAPSHOT.jar --spring.profiles.active=$PROFILES"] | ||
# run jar | ||
ENTRYPOINT ["sh", "-c", "java -jar /app/app.jar --spring.profiles.active=$PROFILES"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?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"> | ||
<mirrors> | ||
<mirror> | ||
<id>alimaven</id> | ||
<name>aliyun maven</name> | ||
<url>http://maven.aliyun.com/nexus/content/groups/public/</url> | ||
<mirrorOf>central</mirrorOf> | ||
</mirror> | ||
</mirrors> | ||
|
||
</settings> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/main/java/com/softeng/dingtalk/aspect/AccessPermission.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package com.softeng.dingtalk.aspect; | ||
|
||
import com.softeng.dingtalk.enums.PermissionEnum; | ||
|
||
import java.lang.annotation.ElementType; | ||
import java.lang.annotation.Retention; | ||
import java.lang.annotation.RetentionPolicy; | ||
import java.lang.annotation.Target; | ||
|
||
/** | ||
* 指定权限通行 | ||
*/ | ||
@Target(ElementType.METHOD) | ||
@Retention(RetentionPolicy.RUNTIME) | ||
public @interface AccessPermission { | ||
PermissionEnum value(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package com.softeng.dingtalk.aspect; | ||
|
||
import com.softeng.dingtalk.component.UserContextHolder; | ||
import com.softeng.dingtalk.exception.CustomExceptionEnum; | ||
import org.aspectj.lang.annotation.Aspect; | ||
import org.aspectj.lang.annotation.Before; | ||
import org.springframework.stereotype.Component; | ||
|
||
import javax.annotation.Resource; | ||
|
||
@Aspect | ||
@Component | ||
public class AuthAspect { | ||
|
||
@Resource | ||
private UserContextHolder userContextHolder; | ||
|
||
@Before("@annotation(accessPermission)") | ||
public void checkPermission(AccessPermission accessPermission) { | ||
for (Integer permissionId : userContextHolder.getUserContext().getPermissionIds()) { | ||
if (accessPermission.value().getCode() == permissionId) { | ||
return; | ||
} | ||
} | ||
CustomExceptionEnum.ACCESS_DENIED.throwWithMessage("需要权限:" + accessPermission.value().getName()); | ||
} | ||
|
||
} |
56 changes: 0 additions & 56 deletions
56
src/main/java/com/softeng/dingtalk/component/EncryptorComponent.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.