代码提交

.idea/libraries/Maven__com_alibaba_fastjson_1_2_54.xml

+<component name="libraryTable">
+  <library name="Maven: com.alibaba:fastjson:1.2.54">
+    <CLASSES>
+      <root url="jar://D:/Tool/apache-maven-3.3.1/maven-repository/com/alibaba/fastjson/1.2.54/fastjson-1.2.54.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/Tool/apache-maven-3.3.1/maven-repository/com/alibaba/fastjson/1.2.54/fastjson-1.2.54-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/Tool/apache-maven-3.3.1/maven-repository/com/alibaba/fastjson/1.2.54/fastjson-1.2.54-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

auth-server/auth-server.iml

@@ -168,6 +168,7 @@
     <orderEntry type="library" name="Maven: org.json:json:20170516" level="project" />
     <orderEntry type="library" name="Maven: org.modelmapper:modelmapper:2.3.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.54" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.6.RELEASE" level="project" />

auth-server/src/main/java/com/jty/wsxt/application/service/AuthRoleServer.java

 package com.jty.wsxt.application.service;
 
 import com.jty.wsxt.domain.model.auth.role.AuthRole;
-import com.jty.nrsc.interfaces.dto.AuthRoleDto;
+import com.jty.wsxt.interfaces.dto.AuthRoleDto;
 import org.springframework.data.domain.Page;
 
 /**

auth-server/src/main/java/com/jty/wsxt/application/service/AuthUserServer.java

 package com.jty.wsxt.application.service;
 
 import com.jty.wsxt.domain.model.auth.history.AuthUserHistory;
-import com.jty.nrsc.interfaces.dto.AuthUserHistoryDto;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.interfaces.dto.AuthUserHistoryDto;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import org.springframework.data.domain.Page;
 
 /**

auth-server/src/main/java/com/jty/wsxt/application/service/NrscTeacherService.java

@@ -2,9 +2,9 @@ package com.jty.wsxt.application.service;
 
 
 import com.jty.wsxt.domain.model.auth.user.nrsc.NrscTeacher;
-import com.jty.nrsc.interfaces.dto.NrscTeacherDto;
-import com.jty.nrsc.interfaces.dto.NrscTeacherSearchDto;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.interfaces.dto.NrscTeacherDto;
+import com.jty.wsxt.interfaces.dto.NrscTeacherSearchDto;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import org.springframework.data.domain.Page;
 
 /**

auth-server/src/main/java/com/jty/wsxt/application/service/impl/AuthRoleServerImpl.java

@@ -4,9 +4,9 @@ import com.jty.wsxt.application.service.AuthRoleServer;
 import com.jty.wsxt.domain.DomainRegistry;
 import com.jty.wsxt.domain.model.auth.authority.AuthAuthority;
 import com.jty.wsxt.domain.model.auth.role.AuthRole;
-import com.jty.nrsc.infrastructure.support.BusinessException;
-import com.jty.nrsc.infrastructure.support.ResultCode;
-import com.jty.nrsc.interfaces.dto.AuthRoleDto;
+import com.jty.wsxt.infrastructure.support.BusinessException;
+import com.jty.wsxt.infrastructure.support.ResultCode;
+import com.jty.wsxt.interfaces.dto.AuthRoleDto;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;

auth-server/src/main/java/com/jty/wsxt/application/service/impl/AuthUserServerImpl.java

@@ -4,11 +4,11 @@ import com.jty.wsxt.application.service.AuthUserServer;
 import com.jty.wsxt.domain.DomainRegistry;
 import com.jty.wsxt.domain.model.auth.history.*;
 import com.jty.wsxt.domain.model.auth.user.AuthUser;
-import com.jty.nrsc.infrastructure.DomainEventPublisher;
-import com.jty.nrsc.infrastructure.support.BusinessException;
-import com.jty.nrsc.infrastructure.support.ResultCode;
-import com.jty.nrsc.interfaces.dto.AuthUserHistoryDto;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.infrastructure.DomainEventPublisher;
+import com.jty.wsxt.infrastructure.support.BusinessException;
+import com.jty.wsxt.infrastructure.support.ResultCode;
+import com.jty.wsxt.interfaces.dto.AuthUserHistoryDto;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;

auth-server/src/main/java/com/jty/wsxt/application/service/impl/NrscTeacherServiceImpl.java

@@ -8,11 +8,11 @@ import com.jty.wsxt.domain.model.auth.user.AuthUser;
 import com.jty.wsxt.domain.model.auth.user.nrsc.NrscTeacher;
 import com.jty.wsxt.domain.model.stage.BasicStage;
 import com.jty.wsxt.domain.model.subject.BasicSubject;
-import com.jty.nrsc.infrastructure.support.BusinessException;
-import com.jty.nrsc.infrastructure.support.ResultCode;
-import com.jty.nrsc.interfaces.dto.NrscTeacherDto;
-import com.jty.nrsc.interfaces.dto.NrscTeacherSearchDto;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.infrastructure.support.BusinessException;
+import com.jty.wsxt.infrastructure.support.ResultCode;
+import com.jty.wsxt.interfaces.dto.NrscTeacherDto;
+import com.jty.wsxt.interfaces.dto.NrscTeacherSearchDto;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.query.criteria.internal.OrderImpl;

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/history/DisableUserSubscriber.java

 package com.jty.wsxt.domain.model.auth.history;
 
-import com.jty.wsxt.domain.DomainRegistry;
 import com.jty.wsxt.domain.model.auth.user.DisableUserEvent;
-import com.jty.nrsc.infrastructure.DomainEventSubscriber;
+import com.jty.wsxt.infrastructure.DomainEventSubscriber;
 
 /**
  * DisableUserSubscriber

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/history/EnableUserSubscriber.java

 package com.jty.wsxt.domain.model.auth.history;
 
 import com.jty.wsxt.domain.model.auth.user.EnableUserEvent;
-import com.jty.nrsc.infrastructure.DomainEventSubscriber;
+import com.jty.wsxt.infrastructure.DomainEventSubscriber;
 
 /**
  * 说明

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/role/AuthRole.java

@@ -4,8 +4,8 @@ import com.jty.wsxt.domain.DomainRegistry;
 import com.jty.wsxt.domain.model.auth.user.AuthUser;
 import com.jty.wsxt.domain.model.auth.authority.AuthAuthority;
 import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
-import com.jty.nrsc.infrastructure.support.BusinessException;
-import com.jty.nrsc.infrastructure.support.ResultCode;
+import com.jty.wsxt.infrastructure.support.BusinessException;
+import com.jty.wsxt.infrastructure.support.ResultCode;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
 

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/user/AuthUser.java

@@ -4,10 +4,10 @@ import com.jty.wsxt.domain.DomainRegistry;
 import com.jty.wsxt.domain.model.auth.role.AuthRole;
 import com.jty.wsxt.domain.model.auth.history.ManagerId;
 import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
-import com.jty.nrsc.infrastructure.DomainEventPublisher;
-import com.jty.nrsc.infrastructure.support.BusinessException;
-import com.jty.nrsc.infrastructure.support.ResultCode;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.infrastructure.DomainEventPublisher;
+import com.jty.wsxt.infrastructure.support.BusinessException;
+import com.jty.wsxt.infrastructure.support.ResultCode;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
 

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/user/DisableUserEvent.java

 package com.jty.wsxt.domain.model.auth.user;
 
 import com.jty.wsxt.domain.model.auth.history.ManagerId;
-import com.jty.nrsc.infrastructure.DomainEvent;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.infrastructure.DomainEvent;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/user/EnableUserEvent.java

 package com.jty.wsxt.domain.model.auth.user;
 
 import com.jty.wsxt.domain.model.auth.history.ManagerId;
-import com.jty.nrsc.infrastructure.DomainEvent;
-import com.jty.nrsc.interfaces.dto.OperatorDto;
+import com.jty.wsxt.infrastructure.DomainEvent;
+import com.jty.wsxt.interfaces.dto.OperatorDto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

auth-server/src/main/java/com/jty/wsxt/domain/model/auth/user/nrsc/NrscTeacher.java

@@ -5,8 +5,8 @@ import com.jty.wsxt.domain.model.auth.user.AuthUser;
 import com.jty.wsxt.domain.model.stage.BasicStage;
 import com.jty.wsxt.domain.model.subject.BasicSubject;
 import com.jty.wsxt.domain.shared.IdentifiedEntityObject;
-import com.jty.nrsc.infrastructure.support.BusinessException;
-import com.jty.nrsc.infrastructure.support.ResultCode;
+import com.jty.wsxt.infrastructure.support.BusinessException;
+import com.jty.wsxt.infrastructure.support.ResultCode;
 import lombok.Data;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;

auth-server/src/main/resources/application.yml

@@ -7,9 +7,9 @@ eureka:
     prefer-ip-address: true
 
 server:
-  port: 9998
+  port: 9997
   servlet:
-    context-path: /manage
+    context-path: /auth
 
 spring:
   application:
@@ -29,9 +29,9 @@ spring:
 #    password: dev@MySQL123
 
   datasource:
-    url: ${JDBC_URL:jdbc:mysql://192.168.2.244:3306/nrsc_question?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false}
-    username: ${JDBC_USERNAME:root}
-    password: ${JDBC_PASSWORD:root}
+    url: ${JDBC_URL:jdbc:mysql://192.168.2.244:3306/jty-wsxt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false}
+    username: ${JDBC_USERNAME:dev}
+    password: ${JDBC_PASSWORD:dev@MySQL123}
   jpa:
     hibernate:
       ddl-auto: update

auth-server/target/classes/META-INF/spring-configuration-metadata.json

@@ -2,31 +2,31 @@
   "hints": [],
   "groups": [
     {
-      "sourceType": "com.jty.nrsc.infrastructure.properties.SecurityProperties",
+      "sourceType": "com.jty.wsxt.infrastructure.properties.SecurityProperties",
       "name": "jty.security",
-      "type": "com.jty.nrsc.infrastructure.properties.SecurityProperties"
+      "type": "com.jty.wsxt.infrastructure.properties.SecurityProperties"
     }
   ],
   "properties": [
     {
-      "sourceType": "com.jty.nrsc.infrastructure.properties.SecurityProperties",
+      "sourceType": "com.jty.wsxt.infrastructure.properties.SecurityProperties",
       "name": "jty.security.code",
-      "type": "com.jty.nrsc.infrastructure.properties.ValidateCodeProperties"
+      "type": "com.jty.wsxt.infrastructure.properties.ValidateCodeProperties"
     },
     {
-      "sourceType": "com.jty.nrsc.infrastructure.properties.SecurityProperties",
+      "sourceType": "com.jty.wsxt.infrastructure.properties.SecurityProperties",
       "defaultValue": 2,
       "name": "jty.security.fail-count",
       "type": "java.lang.Integer"
     },
     {
-      "sourceType": "com.jty.nrsc.infrastructure.properties.SecurityProperties",
+      "sourceType": "com.jty.wsxt.infrastructure.properties.SecurityProperties",
       "defaultValue": "\/login.html",
       "name": "jty.security.login-page",
       "type": "java.lang.String"
     },
     {
-      "sourceType": "com.jty.nrsc.infrastructure.properties.SecurityProperties",
+      "sourceType": "com.jty.wsxt.infrastructure.properties.SecurityProperties",
       "defaultValue": false,
       "name": "jty.security.school-enable",
       "type": "java.lang.Boolean"