wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步1.4版本

Browse Source
This commit is contained in:
Jerry
2021-02-03 21:40:27 +08:00
parent 461b7a303b
commit 3a062ad619
290 changed files with 6973 additions and 4845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
orange-demo-multi-service-for-app/.DS_Store vendored Normal file
View File

Binary file not shown.

1
orange-demo-multi-service-for-app/.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
OrangeMultiDemo

5
orange-demo-multi-service-for-app/.idea/compiler.xml generated
View File

@@ -6,19 +6,19 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="common-redis" />
<module name="upms-service" />
<module name="stats-interface" />
<module name="application-common" />
<module name="gateway" />
<module name="common-swagger" />
<module name="common-sequence" />
<module name="common-redis" />
<module name="course-class-service" />
<module name="common-core" />
<module name="upms-interface" />
<module name="admin-monitor" />
<module name="stats-service" />
<module name="course-class-interface" />
<module name="upms-service" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
@@ -28,6 +28,7 @@
<module name="application-common" target="1.8" />
<module name="common" target="1.8" />
<module name="common-core" target="1.8" />
<module name="common-datafilter" target="1.8" />
<module name="common-redis" target="1.8" />
<module name="common-sequence" target="1.8" />
<module name="common-swagger" target="1.8" />

1
orange-demo-multi-service-for-app/.idea/misc.xml generated
View File

@@ -8,6 +8,7 @@
</option>
<option name="ignoredFiles">
<set>
<option value="$PROJECT_DIR$/common/common-datafilter/pom.xml" />
<option value="$PROJECT_DIR$/framework/apidoc-tools/pom.xml" />
</set>
</option>

14
orange-demo-multi-service-for-app/.idea/workspace.xml generated
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8e833a26-fdef-45f6-a8c9-69c22611e94c" name="Default Changelist" comment="" />
<list default="true" id="be2ffe74-d2e3-4651-9b2b-9383f02a6ecc" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,7 +13,7 @@
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1mYqHJvsDmC9tqOlQivdAjKUGzi" />
<component name="ProjectId" id="1nyJS1Tf4x77OAvHc5z1TqP813w" />
<component name="ProjectViewState">
<option name="abbreviatePackageNames" value="true" />
<option name="autoscrollFromSource" value="true" />
@@ -36,7 +36,7 @@
<recent name="$PROJECT_DIR$/zz-resource/db-scripts" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.CourseClassApplication">
<component name="RunManager" selected="Spring Boot.StatsApplication">
<configuration name="AdminMonitorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="admin-monitor" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.orange.demo.adminmonitor.AdminMonitorApplication" />
@@ -83,12 +83,12 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8e833a26-fdef-45f6-a8c9-69c22611e94c" name="Default Changelist" comment="" />
<created>1609680782670</created>
<changelist id="be2ffe74-d2e3-4651-9b2b-9383f02a6ecc" name="Default Changelist" comment="" />
<created>1612356392884</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1609680782670</updated>
<workItem from="1609680784203" duration="256000" />
<updated>1612356392884</updated>
<workItem from="1612356394589" duration="241000" />
</task>
<servers />
</component>

146
orange-demo-multi-service-for-app/OrangeMultiDemo.iml
View File

@@ -1,146 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.11" level="project" />
<orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.3" level="project" />
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.2.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.7.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.7.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.7.4" level="project" />
<orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.7.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-framework:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-client:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.5.3-beta" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.4.0" level="project" />
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.3-1" level="project" />
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.6.0" level="project" />
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
</component>
</module>

6
orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java
View File

@@ -117,6 +117,12 @@ public class StudentDto {
@NotNull(message = "数据验证失败，所属校区不能为空！")
private Long schoolId;
/**
* 注册时间。
*/
@ApiModelProperty(value = "注册时间")
private Date registerTime;
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/

1
orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml
View File

@@ -31,7 +31,6 @@
AND zz_class.class_level = #{studentClassFilter.classLevel}
</if>
</if>
AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getStudentClassList" resultMap="BaseResultMap" parameterType="com.orange.demo.courseclassservice.model.StudentClass">

2
orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
@@ -32,7 +31,6 @@ public class Grade {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;
}

2
orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.courseclassinterface.constant.ClassLevel;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
@@ -77,7 +76,6 @@ public class StudentClass {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;

2
orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java
View File

@@ -58,7 +58,6 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
@Override
public Student saveNew(Student student) {
student.setStudentId(idGenerator.nextLongId());
student.setRegisterTime(new Date());
MyModelUtil.setDefaultValue(student, "totalCoin", 0);
MyModelUtil.setDefaultValue(student, "leftCoin", 0);
MyModelUtil.setDefaultValue(student, "status", StudentStatus.NORMAL);
@@ -76,7 +75,6 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(Student student, Student originalStudent) {
student.setRegisterTime(originalStudent.getRegisterTime());
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return studentMapper.updateByPrimaryKey(student) == 1;
}

2
orange-demo-multi-service-for-app/application/gateway/pom.xml
View File

@@ -34,7 +34,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger.version}</version>
<version>${zz-swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>

8
orange-demo-multi-service-for-app/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java
View File

@@ -184,7 +184,7 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
if (tokenData == null) {
return ResponseResult.error(errorCode, "内部错误，用户登录令牌对象没有正确返回！");
}
Integer userId = tokenData.getInteger("userId");
Long userId = tokenData.getLong("userId");
if (MyCommonUtil.isBlankOrNull(userId)) {
return ResponseResult.error(errorCode, "内部错误，用户Id没有正确返回！");
}
@@ -204,10 +204,10 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
Map<String, Object> claims = new HashMap<>(1);
claims.put(GatewayConstant.SESSION_ID_KEY_NAME, sessionId);
String token = JwtUtil.generateToken(claims, appConfig.getExpiration(), appConfig.getTokenSigningKey());
// 3. 更新缓存
// 3.1 sessionId -> userId 是hash结构的缓存
String sessionIdKey = RedisKeyUtil.makeSessionIdKeyForRedis(sessionId);
try (Jedis jedis = jedisPool.getResource()) {
// 3. 更新缓存
// 3.1 sessionId -> userId 是hash结构的缓存
String sessionIdKey = RedisKeyUtil.makeSessionIdKeyForRedis(sessionId);
Transaction t = jedis.multi();
for (String tokenKey : tokenData.keySet()) {
t.hset(sessionIdKey, tokenKey, tokenData.getString(tokenKey));

9
orange-demo-multi-service-for-app/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java
View File

@@ -11,8 +11,6 @@ import lombok.Data;
import javax.validation.constraints.*;
import java.util.Date;
/**
* StudentActionTransDto对象。
*
@@ -116,13 +114,6 @@ public class StudentActionTransDto {
@ApiModelProperty(value = "做题是否正确标记")
private Integer exerciseCorrectFlag;
/**
* 发生时间。
*/
@ApiModelProperty(value = "发生时间", required = true)
@NotNull(message = "数据验证失败，发生时间不能为空！")
private Date createTime;
/**
* createTime 范围过滤起始值(>=)。
*/

2
orange-demo-multi-service-for-app/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
@@ -32,7 +31,6 @@ public class Grade {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;
}

2
orange-demo-multi-service-for-app/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java
View File

@@ -55,6 +55,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
@Override
public StudentActionTrans saveNew(StudentActionTrans studentActionTrans) {
studentActionTrans.setTransId(idGenerator.nextLongId());
studentActionTrans.setCreateTime(new Date());
studentActionTransMapper.insert(studentActionTrans);
return studentActionTrans;
}
@@ -69,6 +70,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
studentActionTrans.setCreateTime(originalStudentActionTrans.getCreateTime());
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
}

6
orange-demo-multi-service-for-app/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/vo/SysUserVo.java
View File

@@ -29,12 +29,6 @@ public class SysUserVo {
@ApiModelProperty(value = "登录用户名")
private String loginName;
/**
* 用户密码。
*/
@ApiModelProperty(value = "用户密码")
private String password;
/**
* 用户显示名称。
*/

8
orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
View File

@@ -16,7 +16,6 @@ import com.orange.demo.common.core.util.RsaUtil;
import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.upmsinterface.constant.SysUserStatus;
import com.orange.demo.upmsinterface.constant.SysUserType;
import com.orange.demo.upmsservice.config.ApplicationConfig;
import com.orange.demo.upmsservice.model.SysUser;
import com.orange.demo.upmsservice.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +41,6 @@ public class LoginController {
@Autowired
private SysUserService sysUserService;
@Autowired
private ApplicationConfig appConfig;
@Autowired
private SessionCacheHelper cacheHelper;
@Autowired
private PasswordEncoder passwordEncoder;
@@ -68,11 +65,14 @@ public class LoginController {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
SysUser user = sysUserService.getSysUserByLoginName(loginName);
if (user == null) {
return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
}
password = URLDecoder.decode(password, StandardCharsets.UTF_8.name());
// NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
// 执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
password = RsaUtil.decrypt(password, ApplicationConstant.PRIVATE_KEY);
if (user == null || !passwordEncoder.matches(password, user.getPassword())) {
if (!passwordEncoder.matches(password, user.getPassword())) {
return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
}
String errorMessage;

1
orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml
View File

@@ -42,7 +42,6 @@
AND zz_sys_user.create_time &lt;= #{sysUserFilter.createTimeEnd}
</if>
</if>
AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getSysUserList" resultMap="BaseResultMap" parameterType="com.orange.demo.upmsservice.model.SysUser">

32
orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
View File

@@ -1,18 +1,18 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.upmsinterface.constant.SysUserType;
import com.orange.demo.upmsinterface.constant.SysUserStatus;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.upmsinterface.vo.SysUserVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
import java.util.Date;
import java.util.Map;
/**
@@ -22,8 +22,9 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_user")
public class SysUser {
public class SysUser extends BaseModel {
/**
* 用户Id。
@@ -70,35 +71,10 @@ public class SysUser {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;
/**
* 创建用户Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* createTime 范围过滤起始值(>=)。
*/

9
orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
View File

@@ -53,11 +53,10 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
*/
@Override
public SysUser getSysUserByLoginName(String loginName) {
Example e = new Example(SysUser.class);
Example.Criteria c = e.createCriteria();
c.andEqualTo("loginName", loginName);
c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
return sysUserMapper.selectOneByExample(e);
SysUser filter = new SysUser();
filter.setLoginName(loginName);
filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
return sysUserMapper.selectOne(filter);
}
/**

16
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java Normal file
View File

@@ -0,0 +1,16 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记数据权限中基于DeptId进行过滤的字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DeptFilterColumn {
}

17
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java Normal file
View File

@@ -0,0 +1,17 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 作为DisableDataFilterAspect的切点。
* 该注解仅能标记在方法上，方法内所有的查询语句，均不会被Mybatis插件进行数据过滤。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DisableDataFilter {
}

28
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java Normal file
View File

@@ -0,0 +1,28 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 仅用于微服务的多租户项目。
* 用于注解DAO层Mapper对象的租户过滤规则。被包含的方法将不会进行租户Id的过滤。
* 对于tk mapper和mybatis plus中的内置方法，可以直接指定方法名即可，如：selectOne。
* 需要说明的是，在大多数场景下，只要在实体对象中指定了租户Id字段，基于该主表的绝大部分增删改操作，
* 都需要经过租户Id过滤，仅当查询非常复杂，或者主表不在SQL语句之中的时候，可以通过该注解禁用该SQL，
* 并根据需求通过手动的方式实现租户过滤。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DisableTenantFilter {
/**
* 包含的方法名称数组。该值不能为空，因为如想取消所有方法的租户过滤，
* 可以通过在实体对象中不指定租户Id字段注解的方式实现。
*
* @return 被包括的方法名称数组。
*/
String[] includeMethodName();
}

27
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java Normal file
View File

@@ -0,0 +1,27 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 用于注解DAO层Mapper对象的数据权限规则。
* 由于框架使用了tk.mapper，所以并非所有的Mapper接口均在当前Mapper对象中定义，有一部分被tk.mapper封装，如selectAll等。
* 如果需要排除tk.mapper中的方法，可以直接使用tk.mapper基类所声明的方法名称即可。
* 另外，比较特殊的场景是，因为tk.mapper是通用框架，所以同样的selectAll方法，可以获取不同的数据集合，因此在service中如果
* 出现两个不同的方法调用Mapper的selectAll方法，但是一个需要参与过滤，另外一个不需要参与，那么就需要修改当前类的Mapper方法，
* 将其中一个方法重新定义一个具体的接口方法，并重新设定其是否参与数据过滤。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface EnableDataPerm {
/**
* 排除的方法名称数组。如果为空，所有的方法均会被Mybaits拦截注入权限过滤条件。
*
* @return 被排序的方法名称数据。
*/
String[] excluseMethodName() default {};
}

16
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java Normal file
View File

@@ -0,0 +1,16 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记通过租户Id进行过滤的字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface TenantFilterColumn {
}

16
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java Normal file
View File

@@ -0,0 +1,16 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记数据权限中基于UserId进行过滤的字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface UserFilterColumn {
}

40
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java Normal file
View File

@@ -0,0 +1,40 @@
package com.orange.demo.common.core.base.model;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/**
* 实体对象的公共基类，所有子类均必须包含基类定义的数据表字段和实体对象字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Data
public class BaseModel {
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
}

18
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java
View File

@@ -5,6 +5,7 @@ import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.util.ContextUtil;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Configuration;
/**
@@ -18,9 +19,18 @@ public class FeignConfig implements RequestInterceptor {
@Override
public void apply(RequestTemplate requestTemplate) {
requestTemplate.header(TokenData.REQUEST_ATTRIBUTE_NAME,
ContextUtil.getHttpRequest().getHeader(TokenData.REQUEST_ATTRIBUTE_NAME));
requestTemplate.header(ApplicationConstant.HTTP_HEADER_TRACE_ID,
ContextUtil.getHttpRequest().getHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID));
// 对于非servlet请求发起的远程调用，由于无法获取到标识用户身份的TokenData，因此需要略过下面的HEADER注入。
// 如：由消息队列consumer发起的远程调用请求。
if (!ContextUtil.hasRequestContext()) {
return;
}
String tokenData = ContextUtil.getHttpRequest().getHeader(TokenData.REQUEST_ATTRIBUTE_NAME);
if (StringUtils.isNotBlank(tokenData)) {
requestTemplate.header(TokenData.REQUEST_ATTRIBUTE_NAME, tokenData);
}
String traceId = ContextUtil.getHttpRequest().getHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID);
if (StringUtils.isNotBlank(traceId)) {
requestTemplate.header(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId);
}
}
}

2
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
View File

@@ -206,7 +206,7 @@ public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver
}
}
} else if (parameterType == Boolean.class) {
return value.toString();
return value;
} else if (parameterType == Character.class) {
return value.toString().charAt(0);
}

52
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java Normal file
View File

@@ -0,0 +1,52 @@
package com.orange.demo.common.core.object;
import cn.hutool.core.util.BooleanUtil;
/**
* 线程本地化数据管理的工具类。可根据需求自行添加更多的线程本地化变量及其操作方法。
*
* @author Jerry
* @date 2020-08-08
*/
public class GlobalThreadLocal {
/**
* 存储数据权限过滤是否启用的线程本地化对象。
* 目前的过滤条件，包括数据权限和租户过滤。
*/
private static final ThreadLocal<Boolean> DATA_FILTER_ENABLE = ThreadLocal.withInitial(() -> Boolean.TRUE);
/**
* 设置数据过滤是否打开。如果打开，当前Servlet线程所执行的SQL操作，均会进行数据过滤。
*
* @param enable 打开为true，否则false。
* @return 返回之前的状态，便于恢复。
*/
public static boolean setDataFilter(boolean enable) {
boolean oldValue = DATA_FILTER_ENABLE.get();
DATA_FILTER_ENABLE.set(enable);
return oldValue;
}
/**
* 判断当前Servlet线程所执行的SQL操作，是否进行数据过滤。
*
* @return true 进行数据权限过滤，否则false。
*/
public static boolean enabledDataFilter() {
return BooleanUtil.isTrue(DATA_FILTER_ENABLE.get());
}
/**
* 清空该存储数据，主动释放线程本地化存储资源。
*/
public static void clearDataFilter() {
DATA_FILTER_ENABLE.remove();
}
/**
* 私有构造函数，明确标识该常量类的作用。
*/
private GlobalThreadLocal() {
}
}

15
orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
View File

@@ -31,6 +31,16 @@ public class TokenData {
* 用户Id。
*/
private Long userId;
/**
* 用户所在部门Id。
* 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private Long deptId;
/**
* 租户Id。
* 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private Long tenantId;
/**
* 是否为超级管理员。
*/
@@ -43,6 +53,11 @@ public class TokenData {
* 标识不同登录的会话Id。
*/
private String sessionId;
/**
* 访问uaa的授权token。
* 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private String uaaAccessToken;
/**
* 将令牌对象添加到Http请求对象。

6
orange-demo-multi-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java vendored
View File

@@ -30,7 +30,11 @@ public class RedissonCacheConfig {
/**
* session下上传文件名的缓存(时间是24小时)。
*/
UPLOAD_FILENAME_CACHE(86400000);
UPLOAD_FILENAME_CACHE(86400000),
/**
* 缺省全局缓存(时间是24小时)。
*/
GLOBAL_CACHE(86400000);
/**
* 缓存的时长(单位：毫秒)

28
orange-demo-multi-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java vendored
View File

@@ -1,5 +1,7 @@
package com.orange.demo.common.redis.cache;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.object.TokenData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
@@ -71,4 +73,30 @@ public class SessionCacheHelper {
cacheManager.getCache(c.name()).evict(sessionId);
}
}
/**
* 存放session的Token数据。仅仅单体服务使用。
*
* @param sessionId 当前会话的SessionId。
* @param tokenData 当前会话的JWT Token对象。
*/
public void putTokenData(String sessionId, TokenData tokenData) {
if (sessionId == null || tokenData == null) {
return;
}
Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.GLOBAL_CACHE.name());
cache.put(sessionId, JSON.toJSONString(tokenData));
}
/**
* 获取session的JWT Token对象。
*
* @param sessionId 当前会话的SessionId。
* @return 当前会话的JWT Token对象。
*/
public TokenData getTokenData(String sessionId) {
Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.GLOBAL_CACHE.name());
String tokenString = cache.get(sessionId, String.class);
return JSONObject.parseObject(tokenString, TokenData.class);
}
}

2
orange-demo-multi-service-for-app/pom.xml
View File

@@ -46,7 +46,7 @@
<qdox.version>2.0.0</qdox.version>
<knife4j.version>2.0.5</knife4j.version>
<springfox.version>2.9.2</springfox.version>
<swagger.version>1.5.21</swagger.version>
<zz-swagger.version>1.5.21</zz-swagger.version>
</properties>
<modules>

2
orange-demo-multi-service-for-app/zz-resource/config-data/application-dev.yaml
View File

@@ -94,7 +94,7 @@ swagger:
management:
metrics:
tags:
application:
application: ${spring.application.name}
endpoints:
web:
exposure:

4
orange-demo-multi-service-for-app/zz-resource/config-data/upms-dev.yaml
View File

@@ -28,8 +28,8 @@ sequence:
zkPath: com/orange/demo
mybatis:
mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
typeAliasesPackage: com.orange.demo.*.model
mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml,com/orange/demo/common/datasync/dao/mapper/*Mapper.xml
typeAliasesPackage: com.orange.demo.*.model,com.orange.demo.common.datasync.model
mapper:
mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper

BIN
orange-demo-multi-service-for-app/zz-resource/docker-files/.DS_Store vendored Normal file
View File

Binary file not shown.

2
orange-demo-multi-service-for-app/zz-resource/docker-files/docker-compose.yml
View File

@@ -59,7 +59,7 @@ services:
- zz-test
depends_on:
- zookeeper
sentinel:
image: bladex/sentinel-dashboard
ports:

BIN
orange-demo-multi-service/.DS_Store vendored Normal file
View File

Binary file not shown.

1
orange-demo-multi-service/.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
OrangeMultiDemo

1
orange-demo-multi-service/.idea/compiler.xml generated
View File

@@ -28,6 +28,7 @@
<module name="application-common" target="1.8" />
<module name="common" target="1.8" />
<module name="common-core" target="1.8" />
<module name="common-datafilter" target="1.8" />
<module name="common-redis" target="1.8" />
<module name="common-sequence" target="1.8" />
<module name="common-swagger" target="1.8" />

1
orange-demo-multi-service/.idea/misc.xml generated
View File

@@ -8,6 +8,7 @@
</option>
<option name="ignoredFiles">
<set>
<option value="$PROJECT_DIR$/common/common-datafilter/pom.xml" />
<option value="$PROJECT_DIR$/framework/apidoc-tools/pom.xml" />
</set>
</option>

20
orange-demo-multi-service/.idea/workspace.xml generated
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ba07472a-9cbf-4f92-ba42-dd5d375307a7" name="Default Changelist" comment="" />
<list default="true" id="9db040c5-2354-4004-86ef-274b09107239" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,7 +13,7 @@
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1mYpq9QMeDr2nXWekQ1bdbUatK7" />
<component name="ProjectId" id="1nyIuGiSDcaF7eYaBPxmK1McmDc" />
<component name="ProjectViewState">
<option name="abbreviatePackageNames" value="true" />
<option name="autoscrollFromSource" value="true" />
@@ -36,7 +36,7 @@
<recent name="$PROJECT_DIR$/zz-resource/db-scripts" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.CourseClassApplication">
<component name="RunManager" selected="Spring Boot.UpmsApplication">
<configuration name="AdminMonitorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="admin-monitor" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.orange.demo.adminmonitor.AdminMonitorApplication" />
@@ -83,22 +83,16 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="ba07472a-9cbf-4f92-ba42-dd5d375307a7" name="Default Changelist" comment="" />
<created>1609680566881</created>
<changelist id="9db040c5-2354-4004-86ef-274b09107239" name="Default Changelist" comment="" />
<created>1612356124376</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1609680566881</updated>
<workItem from="1609680568449" duration="164000" />
<updated>1612356124376</updated>
<workItem from="1612356127414" duration="189000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="WindowStateProjectService">
<state x="385" y="196" width="670" height="676" key="search.everywhere.popup" timestamp="1609680683739">
<screen x="0" y="0" width="1440" height="900" />
</state>
<state x="385" y="196" width="670" height="676" key="search.everywhere.popup/0.0.1440.900@0.0.1440.900" timestamp="1609680683739" />
</component>
</project>

146
orange-demo-multi-service/OrangeMultiDemo.iml
View File

@@ -1,146 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.11" level="project" />
<orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.3" level="project" />
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.2.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.7.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.7.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.7.4" level="project" />
<orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.7.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-framework:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-client:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.5.3-beta" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.4.0" level="project" />
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.3-1" level="project" />
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.6.0" level="project" />
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
</component>
</module>

6
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java
View File

@@ -117,6 +117,12 @@ public class StudentDto {
@NotNull(message = "数据验证失败，所属校区不能为空！")
private Long schoolId;
/**
* 注册时间。
*/
@ApiModelProperty(value = "注册时间")
private Date registerTime;
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/

1
orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml
View File

@@ -31,7 +31,6 @@
AND zz_class.class_level = #{studentClassFilter.classLevel}
</if>
</if>
AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getStudentClassList" resultMap="BaseResultMap" parameterType="com.orange.demo.courseclassservice.model.StudentClass">

2
orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
@@ -32,7 +31,6 @@ public class Grade {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;
}

2
orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.courseclassinterface.constant.ClassLevel;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
@@ -77,7 +76,6 @@ public class StudentClass {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;

2
orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java
View File

@@ -58,7 +58,6 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
@Override
public Student saveNew(Student student) {
student.setStudentId(idGenerator.nextLongId());
student.setRegisterTime(new Date());
MyModelUtil.setDefaultValue(student, "totalCoin", 0);
MyModelUtil.setDefaultValue(student, "leftCoin", 0);
MyModelUtil.setDefaultValue(student, "status", StudentStatus.NORMAL);
@@ -76,7 +75,6 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(Student student, Student originalStudent) {
student.setRegisterTime(originalStudent.getRegisterTime());
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return studentMapper.updateByPrimaryKey(student) == 1;
}

2
orange-demo-multi-service/application/gateway/pom.xml
View File

@@ -34,7 +34,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger.version}</version>
<version>${zz-swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>

24
orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java
View File

@@ -189,7 +189,7 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
if (tokenData == null) {
return ResponseResult.error(errorCode, "内部错误，用户登录令牌对象没有正确返回！");
}
Integer userId = tokenData.getInteger("userId");
Long userId = tokenData.getLong("userId");
if (MyCommonUtil.isBlankOrNull(userId)) {
return ResponseResult.error(errorCode, "内部错误，用户Id没有正确返回！");
}
@@ -209,23 +209,19 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
Map<String, Object> claims = new HashMap<>(1);
claims.put(GatewayConstant.SESSION_ID_KEY_NAME, sessionId);
String token = JwtUtil.generateToken(claims, appConfig.getExpiration(), appConfig.getTokenSigningKey());
// 3. 更新缓存
// 3.1 sessionId -> userId 是hash结构的缓存
String sessionIdKey = RedisKeyUtil.makeSessionIdKeyForRedis(sessionId);
String sessionPermKey = null;
JSONArray permSet = null;
if (Boolean.FALSE.equals(isAdmin)) {
// 3.2 sessionId -> permList 是set结构的缓存
sessionPermKey = RedisKeyUtil.makeSessionPermIdKeyForRedis(sessionId);
permSet = loginData.getJSONArray("permSet");
}
try (Jedis jedis = jedisPool.getResource()) {
// 3. 更新缓存
// 3.1 sessionId -> userId 是hash结构的缓存
String sessionIdKey = RedisKeyUtil.makeSessionIdKeyForRedis(sessionId);
Transaction t = jedis.multi();
for (String tokenKey : tokenData.keySet()) {
t.hset(sessionIdKey, tokenKey, tokenData.getString(tokenKey));
}
t.expire(sessionIdKey, appConfig.getSessionIdRedisExpiredSeconds());
// 3.2 sessionId -> permList 是set结构的缓存
JSONArray permSet = loginData.getJSONArray("permSet");
if (permSet != null) {
String sessionPermKey = RedisKeyUtil.makeSessionPermIdKeyForRedis(sessionId);
for (int i = 0; i < permSet.size(); ++i) {
String perm = permSet.getString(i);
t.sadd(sessionPermKey, perm);
@@ -236,10 +232,8 @@ public class AuthenticationPostFilter implements GlobalFilter, Ordered {
}
// 4. 构造返回给用户的应答，将加密后的令牌返回给前端。
loginData.put(TokenData.REQUEST_ATTRIBUTE_NAME, token);
// 如果是管理员，不用返回权限字列表。
if (Boolean.TRUE.equals(isAdmin)) {
loginData.remove("permCodeList");
}
// 5. 这里需要移除权限资源集合的数据，验证在后端进行，无需返回给前端。
loginData.remove("permSet");
return ResponseResult.success(loginData);
}
}

9
orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java
View File

@@ -11,8 +11,6 @@ import lombok.Data;
import javax.validation.constraints.*;
import java.util.Date;
/**
* StudentActionTransDto对象。
*
@@ -116,13 +114,6 @@ public class StudentActionTransDto {
@ApiModelProperty(value = "做题是否正确标记")
private Integer exerciseCorrectFlag;
/**
* 发生时间。
*/
@ApiModelProperty(value = "发生时间", required = true)
@NotNull(message = "数据验证失败，发生时间不能为空！")
private Date createTime;
/**
* createTime 范围过滤起始值(>=)。
*/

2
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
@@ -32,7 +31,6 @@ public class Grade {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;
}

2
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java
View File

@@ -55,6 +55,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
@Override
public StudentActionTrans saveNew(StudentActionTrans studentActionTrans) {
studentActionTrans.setTransId(idGenerator.nextLongId());
studentActionTrans.setCreateTime(new Date());
studentActionTransMapper.insert(studentActionTrans);
return studentActionTrans;
}
@@ -69,6 +70,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
studentActionTrans.setCreateTime(originalStudentActionTrans.getCreateTime());
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
}

2
orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysMenuDto.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.upmsinterface.dto;
import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.upmsinterface.constant.SysMenuType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

6
orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/vo/SysUserVo.java
View File

@@ -30,12 +30,6 @@ public class SysUserVo {
@ApiModelProperty(value = "登录用户名")
private String loginName;
/**
* 用户密码。
*/
@ApiModelProperty(value = "用户密码")
private String password;
/**
* 用户显示名称。
*/

38
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
View File

@@ -16,7 +16,6 @@ import com.orange.demo.common.core.util.RsaUtil;
import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.upmsinterface.constant.SysUserStatus;
import com.orange.demo.upmsinterface.constant.SysUserType;
import com.orange.demo.upmsservice.config.ApplicationConfig;
import com.orange.demo.upmsservice.model.SysMenu;
import com.orange.demo.upmsservice.model.SysUser;
import com.orange.demo.upmsservice.service.*;
@@ -46,12 +45,12 @@ public class LoginController {
@Autowired
private SysPermCodeService sysPermCodeService;
@Autowired
private SysPermService sysPermService;
@Autowired
private SysMenuService sysMenuService;
@Autowired
private SysPermWhitelistService sysPermWhitelistService;
@Autowired
private ApplicationConfig appConfig;
@Autowired
private SessionCacheHelper cacheHelper;
@Autowired
private PasswordEncoder passwordEncoder;
@@ -76,11 +75,14 @@ public class LoginController {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
SysUser user = sysUserService.getSysUserByLoginName(loginName);
if (user == null) {
return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
}
password = URLDecoder.decode(password, StandardCharsets.UTF_8.name());
// NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
// 执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
password = RsaUtil.decrypt(password, ApplicationConstant.PRIVATE_KEY);
if (user == null || !passwordEncoder.matches(password, user.getPassword())) {
if (!passwordEncoder.matches(password, user.getPassword())) {
return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
}
String errorMessage;
@@ -120,19 +122,17 @@ public class LoginController {
JSONObject jsonData = new JSONObject();
jsonData.put("showName", tokenData.getShowName());
jsonData.put("isAdmin", tokenData.getIsAdmin());
List<SysMenu> menuList;
Collection<SysMenu> menuList;
Collection<String> permCodeList;
if (tokenData.getIsAdmin()) {
menuList = sysMenuService.getAllMenuList();
permCodeList = sysPermCodeService.getAllPermCodeList();
} else {
menuList = sysMenuService.getMenuListByUserId(tokenData.getUserId());
List<String> permCodeList = sysPermCodeService.getPermCodeListByUserId(tokenData.getUserId());
jsonData.put("permCodeList", permCodeList);
// 将白名单url列表合并到当前用户的权限资源列表中，便于网关一并处理。
Set<String> permSet = sysUserService.getSysPermSetByUserId(tokenData.getUserId());
permSet.addAll(sysPermWhitelistService.getWhitelistPermList());
jsonData.put("permSet", permSet);
permCodeList = sysPermCodeService.getPermCodeListByUserId(tokenData.getUserId());
}
jsonData.put("menuList", menuList);
jsonData.put("permCodeList", permCodeList);
return ResponseResult.success(jsonData);
}
/**
@@ -177,19 +177,21 @@ public class LoginController {
jsonData.put(TokenData.REQUEST_ATTRIBUTE_NAME, tokenData);
jsonData.put("showName", user.getShowName());
jsonData.put("isAdmin", isAdmin);
List<SysMenu> menuList;
Collection<SysMenu> menuList;
Collection<String> permCodeList;
if (isAdmin) {
menuList = sysMenuService.getAllMenuList();
permCodeList = sysPermCodeService.getAllPermCodeList();
} else {
menuList = sysMenuService.getMenuListByUserId(user.getUserId());
List<String> permCodeList = sysPermCodeService.getPermCodeListByUserId(user.getUserId());
jsonData.put("permCodeList", permCodeList);
menuList = sysMenuService.getMenuListByUserId(tokenData.getUserId());
permCodeList = sysPermCodeService.getPermCodeListByUserId(user.getUserId());
// 将白名单url列表合并到当前用户的权限资源列表中，便于网关一并处理。
Set<String> permSet = sysUserService.getSysPermSetByUserId(user.getUserId());
permSet.addAll(sysPermWhitelistService.getWhitelistPermList());
jsonData.put("permSet", permSet);
Collection<String> permList = sysPermService.getPermListByUserId(user.getUserId());
permList.addAll(sysPermWhitelistService.getWhitelistPermList());
jsonData.put("permSet", permList);
}
jsonData.put("menuList", menuList);
jsonData.put("permCodeList", permCodeList);
return jsonData;
}
}

4
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysMenuController.java
View File

@@ -127,9 +127,9 @@ public class SysMenuController {
*
* @return 应答结果对象，包含全部菜单数据列表。
*/
@GetMapping("/list")
@PostMapping("/list")
public ResponseResult<List<SysMenuVo>> list() {
List<SysMenu> sysMenuList = sysMenuService.getAllListByOrder("menuType", "showOrder");
Collection<SysMenu> sysMenuList = sysMenuService.getAllListByOrder("showOrder");
return ResponseResult.success(MyModelUtil.copyCollectionTo(sysMenuList, SysMenuVo.class));
}

4
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermModuleController.java
View File

@@ -122,7 +122,7 @@ public class SysPermModuleController {
*
* @return 应答结果对象，包含权限资源模块列表。
*/
@GetMapping("/list")
@PostMapping("/list")
public ResponseResult<List<SysPermModuleVo>> list() {
List<SysPermModule> permModuleList = sysPermModuleService.getAllListByOrder("showOrder");
return ResponseResult.success(MyModelUtil.copyCollectionTo(permModuleList, SysPermModuleVo.class));
@@ -133,7 +133,7 @@ public class SysPermModuleController {
*
* @return 应答结果对象，包含树状列表，
*/
@GetMapping("/listAll")
@PostMapping("/listAll")
public ResponseResult<List<Map<String, Object>>> listAll() {
List<SysPermModule> sysPermModuleList = sysPermModuleService.getPermModuleAndPermList();
List<Map<String, Object>> resultList = new LinkedList<>();

2
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysRoleController.java
View File

@@ -292,7 +292,7 @@ public class SysRoleController {
}
return ResponseResult.success();
}
/**
* 查询角色的权限资源地址列表。同时返回详细的分配路径。
*

4
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermMapper.java
View File

@@ -21,7 +21,7 @@ public interface SysPermMapper extends BaseDaoMapper<SysPerm> {
* @param userId 用户Id。
* @return 该用户的权限标识列表。
*/
List<SysPerm> getPermListByUserId(@Param("userId") Long userId);
List<String> getPermListByUserId(@Param("userId") Long userId);
/**
* 查询权限资源地址的用户列表。同时返回详细的分配路径。
@@ -51,5 +51,5 @@ public interface SysPermMapper extends BaseDaoMapper<SysPerm> {
* @return 包含从权限资源到菜单的权限分配路径信息的查询结果列表。
*/
List<Map<String, Object>> getSysMenuListWithDetail(
@Param("permId") Long permId, @Param("menuName") String menuName);
@Param("permId") Long permId, @Param("menuName") String menuName);
}

4
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuMapper.xml
View File

@@ -18,7 +18,7 @@
<select id="getMenuListByUserId" resultMap="BaseResultMap">
SELECT
DISTINCT m.*
m.*
FROM
zz_sys_user_role ur,
zz_sys_role_menu rm,
@@ -83,5 +83,5 @@
</where>
ORDER BY
u.user_id, r.role_id
</select>
</select>
</mapper>

4
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuPermCodeMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.orange.demo.upmsservice.dao.SysMenuPermCodeMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.upmsservice.model.SysMenuPermCode">
<result column="menu_id" jdbcType="BIGINT" property="menuId"/>
<result column="perm_code_id" jdbcType="BIGINT" property="permCodeId"/>
<id column="menu_id" jdbcType="BIGINT" property="menuId"/>
<id column="perm_code_id" jdbcType="BIGINT" property="permCodeId"/>
</resultMap>
</mapper>

2
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermCodeMapper.xml
View File

@@ -17,7 +17,7 @@
<select id="getPermCodeListByUserId" resultType="java.lang.String">
SELECT
DISTINCT pc.perm_code
pc.perm_code
FROM
zz_sys_user_role ur,
zz_sys_role_menu rm,

6
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermMapper.xml
View File

@@ -14,9 +14,9 @@
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<select id="getPermListByUserId" resultMap="BaseResultMap">
<select id="getPermListByUserId" resultType="java.lang.String">
SELECT
p.*
p.url
FROM
zz_sys_user_role ur,
zz_sys_role_menu rm,
@@ -128,5 +128,5 @@
</where>
ORDER BY
m.menu_id, pc.perm_code_id
</select>
</select>
</mapper>

5
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermModuleMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.orange.demo.upmsservice.dao.SysPermModuleMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.upmsservice.model.SysPermModule">
<result column="module_id" jdbcType="BIGINT" property="moduleId"/>
<id column="module_id" jdbcType="BIGINT" property="moduleId"/>
<result column="parent_id" jdbcType="BIGINT" property="parentId"/>
<result column="module_name" jdbcType="VARCHAR" property="moduleName"/>
<result column="module_type" jdbcType="INTEGER" property="moduleType"/>
@@ -34,9 +34,8 @@
FROM
zz_sys_perm_module pm
LEFT JOIN
zz_sys_perm p ON pm.module_id = p.module_id
zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
<where>
AND p.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
AND pm.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</where>
ORDER BY

3
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml
View File

@@ -42,7 +42,6 @@
AND zz_sys_user.create_time &lt;= #{sysUserFilter.createTimeEnd}
</if>
</if>
AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getSysUserList" resultMap="BaseResultMap" parameterType="com.orange.demo.upmsservice.model.SysUser">
@@ -101,7 +100,7 @@
ORDER BY ${orderBy}
</if>
</select>
<!-- 以下查询仅用于权限分配的问题定位，由于关联表较多，可能会给系统运行带来性能影响 -->
<select id="getSysPermListWithDetail" resultType="map">
SELECT

31
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
View File

@@ -1,11 +1,12 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.upmsinterface.vo.SysMenuVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
@@ -20,8 +21,9 @@ import java.util.*;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_menu")
public class SysMenu {
public class SysMenu extends BaseModel {
/**
* 主键Id。
@@ -65,34 +67,9 @@ public class SysMenu {
*/
private String icon;
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;

31
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
View File

@@ -1,9 +1,10 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.annotation.RelationDict;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
import java.util.*;
@@ -15,8 +16,9 @@ import java.util.*;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_perm")
public class SysPerm {
public class SysPerm extends BaseModel {
/**
* 权限Id。
@@ -48,34 +50,9 @@ public class SysPerm {
@Column(name = "show_order")
private Integer showOrder;
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;

31
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
View File

@@ -1,11 +1,12 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.upmsinterface.vo.SysPermCodeVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
@@ -20,8 +21,9 @@ import java.util.*;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_perm_code")
public class SysPermCode {
public class SysPermCode extends BaseModel {
/**
* 主键Id。
@@ -60,34 +62,9 @@ public class SysPermCode {
@Column(name = "show_order")
private Integer showOrder;
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;

31
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
View File

@@ -1,8 +1,9 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.base.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
import java.util.*;
@@ -14,8 +15,9 @@ import java.util.*;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_perm_module")
public class SysPermModule {
public class SysPermModule extends BaseModel {
/**
* 权限模块Id。
@@ -48,34 +50,9 @@ public class SysPermModule {
@Column(name = "show_order")
private Integer showOrder;
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;

31
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
View File

@@ -1,11 +1,12 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.upmsinterface.vo.SysRoleVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
@@ -20,8 +21,9 @@ import java.util.*;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_role")
public class SysRole {
public class SysRole extends BaseModel {
/**
* 主键Id。
@@ -36,34 +38,9 @@ public class SysRole {
@Column(name = "role_name")
private String roleName;
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;

32
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
View File

@@ -1,19 +1,19 @@
package com.orange.demo.upmsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.upmsinterface.constant.SysUserType;
import com.orange.demo.upmsinterface.constant.SysUserStatus;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.upmsinterface.vo.SysUserVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
import java.util.Date;
import java.util.Map;
import java.util.List;
@@ -24,8 +24,9 @@ import java.util.List;
* @date 2020-08-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name = "zz_sys_user")
public class SysUser {
public class SysUser extends BaseModel {
/**
* 用户Id。
@@ -72,35 +73,10 @@ public class SysUser {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
private Integer deletedFlag;
/**
* 创建用户Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
/**
* createTime 范围过滤起始值(>=)。
*/

6
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysMenuService.java
View File

@@ -46,15 +46,15 @@ public interface SysMenuService extends IBaseService<SysMenu, Long> {
*
* @return 全部菜单列表。
*/
List<SysMenu> getAllMenuList();
Collection<SysMenu> getAllMenuList();
/**
* 获取指定用户Id的菜单列表。
* 获取指定用户Id的菜单列表，已去重。
*
* @param userId 用户主键Id。
* @return 用户关联的菜单列表。
*/
List<SysMenu> getMenuListByUserId(Long userId);
Collection<SysMenu> getMenuListByUserId(Long userId);
/**
* 判断当前菜单是否存在子菜单。

11
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermCodeService.java
View File

@@ -15,12 +15,19 @@ import java.util.*;
public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
/**
* 获取指定用户的权限字列表。
* 获取指定用户的权限字列表，已去重。
*
* @param userId 用户主键Id。
* @return 用户关联的权限字列表。
*/
List<String> getPermCodeListByUserId(Long userId);
Collection<String> getPermCodeListByUserId(Long userId);
/**
* 获取所有权限字数据列表，已去重。
*
* @return 全部权限字列表。
*/
Collection<String> getAllPermCodeList();
/**
* 保存新增的权限字对象。

6
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermService.java
View File

@@ -48,12 +48,12 @@ public interface SysPermService extends IBaseService<SysPerm, Long> {
List<SysPerm> getPermListWithRelation(SysPerm sysPermFilter);
/**
* 获取与指定用户关联的权限资源列表。
* 获取与指定用户关联的权限资源列表，已去重。
*
* @param userId 关联的用户主键Id。
* @return 与指定用户Id关联的权限资源列表。
* @return 与指定用户Id关联的权限资源URL列表。
*/
List<SysPerm> getPermListByUserId(Long userId);
Collection<String> getPermListByUserId(Long userId);
/**
* 验证权限资源对象关联的数据是否都合法。

8
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
View File

@@ -104,14 +104,6 @@ public interface SysUserService extends IBaseService<SysUser, Long> {
<M> List<SysUser> getSysUserListWithRelation(
String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy);
/**
* 获取指定用户的权限集合。
*
* @param userId 用户主键Id。
* @return 用户权限集合。
*/
Set<String> getSysPermSetByUserId(Long userId);
/**
* 获取指定角色的用户列表。
*

20
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java
View File

@@ -10,12 +10,13 @@ import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.upmsinterface.constant.SysMenuType;
import com.orange.demo.upmsservice.service.SysMenuService;
import com.orange.demo.upmsservice.service.SysPermCodeService;
import com.orange.demo.upmsservice.dao.SysMenuMapper;
import com.orange.demo.upmsservice.dao.SysMenuPermCodeMapper;
import com.orange.demo.upmsservice.dao.SysRoleMenuMapper;
import com.orange.demo.upmsservice.dao.SysMenuMapper;
import com.orange.demo.upmsservice.model.SysMenu;
import com.orange.demo.upmsservice.model.SysMenuPermCode;
import com.orange.demo.upmsservice.model.SysRoleMenu;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -66,8 +67,8 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
@Override
public SysMenu saveNew(SysMenu sysMenu, Set<Long> permCodeIdSet) {
sysMenu.setMenuId(idGenerator.nextLongId());
MyModelUtil.fillCommonsForInsert(sysMenu);
sysMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(sysMenu);
sysMenuMapper.insert(sysMenu);
if (permCodeIdSet != null) {
List<SysMenuPermCode> sysMenuPermCodeList = new LinkedList<>();
@@ -142,9 +143,9 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
* @return 全部菜单列表。
*/
@Override
public List<SysMenu> getAllMenuList() {
public Collection<SysMenu> getAllMenuList() {
Example e = new Example(SysMenu.class);
e.orderBy("menuType").orderBy("showOrder");
e.orderBy("showOrder");
Example.Criteria c = e.createCriteria();
c.andIn("menuType", Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
@@ -152,14 +153,19 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
}
/**
* 获取指定用户Id的菜单列表。
* 获取指定用户Id的菜单列表，已去重。
*
* @param userId 用户主键Id。
* @return 用户关联的菜单列表。
*/
@Override
public List<SysMenu> getMenuListByUserId(Long userId) {
return sysMenuMapper.getMenuListByUserId(userId);
public Collection<SysMenu> getMenuListByUserId(Long userId) {
List<SysMenu> menuList = sysMenuMapper.getMenuListByUserId(userId);
LinkedHashMap<Long, SysMenu> menuMap = new LinkedHashMap<>();
for (SysMenu menu : menuList) {
menuMap.put(menu.getMenuId(), menu);
}
return menuMap.values();
}
/**

22
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermCodeServiceImpl.java
View File

@@ -54,14 +54,26 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
}
/**
* 获取指定用户的权限字列表。
* 获取指定用户的权限字列表，已去重。
*
* @param userId 用户主键Id。
* @return 用户关联的权限字列表。
*/
@Override
public List<String> getPermCodeListByUserId(Long userId) {
return sysPermCodeMapper.getPermCodeListByUserId(userId);
public Collection<String> getPermCodeListByUserId(Long userId) {
List<String> permCodeList = sysPermCodeMapper.getPermCodeListByUserId(userId);
return new HashSet<>(permCodeList);
}
/**
* 获取所有权限字数据列表，已去重。
*
* @return 全部权限字列表。
*/
@Override
public Collection<String> getAllPermCodeList() {
List<SysPermCode> permCodeList = this.getAllList();
return permCodeList.stream().map(SysPermCode::getPermCode).collect(Collectors.toSet());
}
/**
@@ -75,8 +87,8 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
@Override
public SysPermCode saveNew(SysPermCode sysPermCode, Set<Long> permIdSet) {
sysPermCode.setPermCodeId(idGenerator.nextLongId());
MyModelUtil.fillCommonsForInsert(sysPermCode);
sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(sysPermCode);
sysPermCodeMapper.insert(sysPermCode);
if (permIdSet != null) {
List<SysPermCodePerm> sysPermCodePermList = new LinkedList<>();
@@ -102,9 +114,9 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<Long> permIdSet) {
MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
sysPermCode.setParentId(originalSysPermCode.getParentId());
sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
if (sysPermCodeMapper.updateByPrimaryKey(sysPermCode) != 1) {
return false;
}

10
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermServiceImpl.java
View File

@@ -19,8 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 权限资源数据服务类。
@@ -124,14 +123,15 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
}
/**
* 获取与指定用户关联的权限资源列表。
* 获取与指定用户关联的权限资源列表，已去重。
*
* @param userId 关联的用户主键Id。
* @return 与指定用户Id关联的权限资源列表。
*/
@Override
public List<SysPerm> getPermListByUserId(Long userId) {
return sysPermMapper.getPermListByUserId(userId);
public Collection<String> getPermListByUserId(Long userId) {
List<String> urlList = sysPermMapper.getPermListByUserId(userId);
return new HashSet<>(urlList);
}
/**

6
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysRoleServiceImpl.java
View File

@@ -2,8 +2,8 @@ package com.orange.demo.upmsservice.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.orange.demo.common.core.constant.GlobalDeletedFlag;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.object.CallResult;
@@ -64,8 +64,8 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
@Override
public SysRole saveNew(SysRole role, Set<Long> menuIdSet) {
role.setRoleId(idGenerator.nextLongId());
MyModelUtil.fillCommonsForInsert(role);
role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForInsert(role);
sysRoleMapper.insert(role);
if (menuIdSet != null) {
List<SysRoleMenu> roleMenuList = new LinkedList<>();
@@ -91,8 +91,8 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(SysRole role, SysRole originalRole, Set<Long> menuIdSet) {
MyModelUtil.fillCommonsForUpdate(role, originalRole);
role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForUpdate(role, originalRole);
if (sysRoleMapper.updateByPrimaryKey(role) != 1) {
return false;
}

23
orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
View File

@@ -36,8 +36,6 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
@Autowired
private SysUserRoleMapper sysUserRoleMapper;
@Autowired
private SysPermService sysPermService;
@Autowired
private SysRoleService sysRoleService;
@Autowired
private IdGeneratorWrapper idGenerator;
@@ -62,11 +60,10 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
*/
@Override
public SysUser getSysUserByLoginName(String loginName) {
Example e = new Example(SysUser.class);
Example.Criteria c = e.createCriteria();
c.andEqualTo("loginName", loginName);
c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
return sysUserMapper.selectOneByExample(e);
SysUser filter = new SysUser();
filter.setLoginName(loginName);
filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
return sysUserMapper.selectOne(filter);
}
/**
@@ -237,18 +234,6 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
return resultList;
}
/**
* 获取指定用户的权限集合。
*
* @param userId 用户主键Id。
* @return 用户权限集合。
*/
@Override
public Set<String> getSysPermSetByUserId(Long userId) {
List<SysPerm> permList = sysPermService.getPermListByUserId(userId);
return permList.stream().map(SysPerm::getUrl).collect(Collectors.toSet());
}
/**
* 获取指定角色的用户列表。
*

16
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java Normal file
View File

@@ -0,0 +1,16 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记数据权限中基于DeptId进行过滤的字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DeptFilterColumn {
}

17
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java Normal file
View File

@@ -0,0 +1,17 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 作为DisableDataFilterAspect的切点。
* 该注解仅能标记在方法上，方法内所有的查询语句，均不会被Mybatis插件进行数据过滤。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DisableDataFilter {
}

28
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java Normal file
View File

@@ -0,0 +1,28 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 仅用于微服务的多租户项目。
* 用于注解DAO层Mapper对象的租户过滤规则。被包含的方法将不会进行租户Id的过滤。
* 对于tk mapper和mybatis plus中的内置方法，可以直接指定方法名即可，如：selectOne。
* 需要说明的是，在大多数场景下，只要在实体对象中指定了租户Id字段，基于该主表的绝大部分增删改操作，
* 都需要经过租户Id过滤，仅当查询非常复杂，或者主表不在SQL语句之中的时候，可以通过该注解禁用该SQL，
* 并根据需求通过手动的方式实现租户过滤。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DisableTenantFilter {
/**
* 包含的方法名称数组。该值不能为空，因为如想取消所有方法的租户过滤，
* 可以通过在实体对象中不指定租户Id字段注解的方式实现。
*
* @return 被包括的方法名称数组。
*/
String[] includeMethodName();
}

27
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java Normal file
View File

@@ -0,0 +1,27 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 用于注解DAO层Mapper对象的数据权限规则。
* 由于框架使用了tk.mapper，所以并非所有的Mapper接口均在当前Mapper对象中定义，有一部分被tk.mapper封装，如selectAll等。
* 如果需要排除tk.mapper中的方法，可以直接使用tk.mapper基类所声明的方法名称即可。
* 另外，比较特殊的场景是，因为tk.mapper是通用框架，所以同样的selectAll方法，可以获取不同的数据集合，因此在service中如果
* 出现两个不同的方法调用Mapper的selectAll方法，但是一个需要参与过滤，另外一个不需要参与，那么就需要修改当前类的Mapper方法，
* 将其中一个方法重新定义一个具体的接口方法，并重新设定其是否参与数据过滤。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface EnableDataPerm {
/**
* 排除的方法名称数组。如果为空，所有的方法均会被Mybaits拦截注入权限过滤条件。
*
* @return 被排序的方法名称数据。
*/
String[] excluseMethodName() default {};
}

16
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java Normal file
View File

@@ -0,0 +1,16 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记通过租户Id进行过滤的字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface TenantFilterColumn {
}

16
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java Normal file
View File

@@ -0,0 +1,16 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记数据权限中基于UserId进行过滤的字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface UserFilterColumn {
}

40
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java Normal file
View File

@@ -0,0 +1,40 @@
package com.orange.demo.common.core.base.model;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/**
* 实体对象的公共基类，所有子类均必须包含基类定义的数据表字段和实体对象字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Data
public class BaseModel {
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
private Date updateTime;
}

18
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java
View File

@@ -5,6 +5,7 @@ import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.util.ContextUtil;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Configuration;
/**
@@ -18,9 +19,18 @@ public class FeignConfig implements RequestInterceptor {
@Override
public void apply(RequestTemplate requestTemplate) {
requestTemplate.header(TokenData.REQUEST_ATTRIBUTE_NAME,
ContextUtil.getHttpRequest().getHeader(TokenData.REQUEST_ATTRIBUTE_NAME));
requestTemplate.header(ApplicationConstant.HTTP_HEADER_TRACE_ID,
ContextUtil.getHttpRequest().getHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID));
// 对于非servlet请求发起的远程调用，由于无法获取到标识用户身份的TokenData，因此需要略过下面的HEADER注入。
// 如：由消息队列consumer发起的远程调用请求。
if (!ContextUtil.hasRequestContext()) {
return;
}
String tokenData = ContextUtil.getHttpRequest().getHeader(TokenData.REQUEST_ATTRIBUTE_NAME);
if (StringUtils.isNotBlank(tokenData)) {
requestTemplate.header(TokenData.REQUEST_ATTRIBUTE_NAME, tokenData);
}
String traceId = ContextUtil.getHttpRequest().getHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID);
if (StringUtils.isNotBlank(traceId)) {
requestTemplate.header(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId);
}
}
}

2
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
View File

@@ -206,7 +206,7 @@ public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver
}
}
} else if (parameterType == Boolean.class) {
return value.toString();
return value;
} else if (parameterType == Character.class) {
return value.toString().charAt(0);
}

52
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java Normal file
View File

@@ -0,0 +1,52 @@
package com.orange.demo.common.core.object;
import cn.hutool.core.util.BooleanUtil;
/**
* 线程本地化数据管理的工具类。可根据需求自行添加更多的线程本地化变量及其操作方法。
*
* @author Jerry
* @date 2020-08-08
*/
public class GlobalThreadLocal {
/**
* 存储数据权限过滤是否启用的线程本地化对象。
* 目前的过滤条件，包括数据权限和租户过滤。
*/
private static final ThreadLocal<Boolean> DATA_FILTER_ENABLE = ThreadLocal.withInitial(() -> Boolean.TRUE);
/**
* 设置数据过滤是否打开。如果打开，当前Servlet线程所执行的SQL操作，均会进行数据过滤。
*
* @param enable 打开为true，否则false。
* @return 返回之前的状态，便于恢复。
*/
public static boolean setDataFilter(boolean enable) {
boolean oldValue = DATA_FILTER_ENABLE.get();
DATA_FILTER_ENABLE.set(enable);
return oldValue;
}
/**
* 判断当前Servlet线程所执行的SQL操作，是否进行数据过滤。
*
* @return true 进行数据权限过滤，否则false。
*/
public static boolean enabledDataFilter() {
return BooleanUtil.isTrue(DATA_FILTER_ENABLE.get());
}
/**
* 清空该存储数据，主动释放线程本地化存储资源。
*/
public static void clearDataFilter() {
DATA_FILTER_ENABLE.remove();
}
/**
* 私有构造函数，明确标识该常量类的作用。
*/
private GlobalThreadLocal() {
}
}

15
orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
View File

@@ -31,6 +31,16 @@ public class TokenData {
* 用户Id。
*/
private Long userId;
/**
* 用户所在部门Id。
* 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private Long deptId;
/**
* 租户Id。
* 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private Long tenantId;
/**
* 是否为超级管理员。
*/
@@ -43,6 +53,11 @@ public class TokenData {
* 标识不同登录的会话Id。
*/
private String sessionId;
/**
* 访问uaa的授权token。
* 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private String uaaAccessToken;
/**
* 将令牌对象添加到Http请求对象。

6
orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java vendored
View File

@@ -30,7 +30,11 @@ public class RedissonCacheConfig {
/**
* session下上传文件名的缓存(时间是24小时)。
*/
UPLOAD_FILENAME_CACHE(86400000);
UPLOAD_FILENAME_CACHE(86400000),
/**
* 缺省全局缓存(时间是24小时)。
*/
GLOBAL_CACHE(86400000);
/**
* 缓存的时长(单位：毫秒)

28
orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java vendored
View File

@@ -1,5 +1,7 @@
package com.orange.demo.common.redis.cache;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.object.TokenData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
@@ -71,4 +73,30 @@ public class SessionCacheHelper {
cacheManager.getCache(c.name()).evict(sessionId);
}
}
/**
* 存放session的Token数据。仅仅单体服务使用。
*
* @param sessionId 当前会话的SessionId。
* @param tokenData 当前会话的JWT Token对象。
*/
public void putTokenData(String sessionId, TokenData tokenData) {
if (sessionId == null || tokenData == null) {
return;
}
Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.GLOBAL_CACHE.name());
cache.put(sessionId, JSON.toJSONString(tokenData));
}
/**
* 获取session的JWT Token对象。
*
* @param sessionId 当前会话的SessionId。
* @return 当前会话的JWT Token对象。
*/
public TokenData getTokenData(String sessionId) {
Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.GLOBAL_CACHE.name());
String tokenString = cache.get(sessionId, String.class);
return JSONObject.parseObject(tokenString, TokenData.class);
}
}

2
orange-demo-multi-service/pom.xml
View File

@@ -46,7 +46,7 @@
<qdox.version>2.0.0</qdox.version>
<knife4j.version>2.0.5</knife4j.version>
<springfox.version>2.9.2</springfox.version>
<swagger.version>1.5.21</swagger.version>
<zz-swagger.version>1.5.21</zz-swagger.version>
</properties>
<modules>

BIN
orange-demo-multi-service/zz-resource/.DS_Store vendored Normal file
View File

Binary file not shown.

2
orange-demo-multi-service/zz-resource/config-data/application-dev.yaml
View File

@@ -94,7 +94,7 @@ swagger:
management:
metrics:
tags:
application:
application: ${spring.application.name}
endpoints:
web:
exposure:

4
orange-demo-multi-service/zz-resource/config-data/upms-dev.yaml
View File

@@ -28,8 +28,8 @@ sequence:
zkPath: com/orange/demo
mybatis:
mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml
typeAliasesPackage: com.orange.demo.*.model
mapperLocations: classpath:com/orange/demo/*/dao/mapper/*Mapper.xml,com/orange/demo/common/datasync/dao/mapper/*Mapper.xml
typeAliasesPackage: com.orange.demo.*.model,com.orange.demo.common.datasync.model
mapper:
mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper

Some files were not shown because too many files have changed in this diff Show More