陶汉栋 / MyCloud

Download as
Browse Code »

Commit e92e5a924fcb4bbc471e09ef4e4df2d08c1f06f8

Authored by 陶汉栋
1 parent 6879cd62
Exists in master

增加网关负载

Showing 599 changed files with 44289 additions and 43807 deletions   Show diff stats

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 599 files displayed.

cloud/RibbonConsume/src/main/java/com/sincere/ribbon/RibbonApplication.java
  Diff comments   View file @e92e5a9
@@ -14,14 +14,13 @@ public class RibbonApplication { @@ -14,14 +14,13 @@ public class RibbonApplication {
14 14
15 @Bean 15 @Bean
16 @LoadBalanced 16 @LoadBalanced
17 - RestTemplate restTemplate(){ 17 + RestTemplate restTemplate() {
18 return new RestTemplate(); 18 return new RestTemplate();
19 } 19 }
20 20
21 public static void main(String[] args) { 21 public static void main(String[] args) {
22 - SpringApplication.run(RibbonApplication.class,args); 22 + SpringApplication.run(RibbonApplication.class, args);
23 } 23 }
24 24
25 25
26 -  
27 } 26 }
cloud/RibbonConsume/src/main/java/com/sincere/ribbon/control/FileRibbonControl.java
  Diff comments   View file @e92e5a9
@@ -36,7 +36,7 @@ public class FileRibbonControl { @@ -36,7 +36,7 @@ public class FileRibbonControl {
36 // String value = request.getHeader(key); 36 // String value = request.getHeader(key);
37 // requestHeaders.add(key, value); 37 // requestHeaders.add(key, value);
38 // } 38 // }
39 - requestHeaders.add("ossPath","ceshi"); 39 + requestHeaders.add("ossPath", "ceshi");
40 Map<String, String[]> params = new HashMap<>(); 40 Map<String, String[]> params = new HashMap<>();
41 //获取parameter信息 41 //获取parameter信息
42 if (params == null) { 42 if (params == null) {
@@ -44,7 +44,7 @@ public class FileRibbonControl { @@ -44,7 +44,7 @@ public class FileRibbonControl {
44 } 44 }
45 45
46 HttpEntity<String> requestEntity = new HttpEntity<String>(null, requestHeaders); 46 HttpEntity<String> requestEntity = new HttpEntity<String>(null, requestHeaders);
47 - ResponseEntity<String> rss = restTemplate.exchange("http://file-center/file/deleteFile/"+fileName, HttpMethod.DELETE, requestEntity, String.class, params); 47 + ResponseEntity<String> rss = restTemplate.exchange("http://file-center/file/deleteFile/" + fileName, HttpMethod.DELETE, requestEntity, String.class, params);
48 logger.error("删除文件:" + rss.getStatusCodeValue()); 48 logger.error("删除文件:" + rss.getStatusCodeValue());
49 return true; 49 return true;
50 50
cloud/RibbonConsume/src/main/java/com/sincere/ribbon/control/RibbonConsumeControl.java
  Diff comments   View file @e92e5a9
@@ -29,9 +29,9 @@ public class RibbonConsumeControl { @@ -29,9 +29,9 @@ public class RibbonConsumeControl {
29 @Autowired 29 @Autowired
30 private DiscoveryClient discoveryClient; 30 private DiscoveryClient discoveryClient;
31 31
32 - @RequestMapping(value = "login",method = RequestMethod.GET )  
33 - public String login(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("userType")String userType){  
34 - LOG.error("登录中:"+account+password+userType); 32 + @RequestMapping(value = "login", method = RequestMethod.GET)
  33 + public String login(@RequestParam("account") String account, @RequestParam("password") String password, @RequestParam("userType") String userType) {
  34 + LOG.error("登录中:" + account + password + userType);
35 HttpHeaders headers = new HttpHeaders(); 35 HttpHeaders headers = new HttpHeaders();
36 36
37 Login login = new Login(); 37 Login login = new Login();
@@ -39,8 +39,8 @@ public class RibbonConsumeControl { @@ -39,8 +39,8 @@ public class RibbonConsumeControl {
39 login.setPassword(password); 39 login.setPassword(password);
40 login.setUserType(userType); 40 login.setUserType(userType);
41 41
42 - String result = restTemplate.postForEntity("http://authserver/login",login,String.class).getBody();  
43 - LOG.error("登录结果:"+result); 42 + String result = restTemplate.postForEntity("http://authserver/login", login, String.class).getBody();
  43 + LOG.error("登录结果:" + result);
44 return result; 44 return result;
45 45
46 } 46 }
cloud/RibbonConsume/src/main/resources/bootstrap.yml
  Diff comments   View file @e92e5a9
@@ -7,24 +7,24 @@ server: @@ -7,24 +7,24 @@ server:
7 spring: 7 spring:
8 application: 8 application:
9 name: ribbon-consume 9 name: ribbon-consume
10 - 10 +
11 #eureka client配置 11 #eureka client配置
12 eureka: 12 eureka:
13 client: 13 client:
14 serviceUrl: 14 serviceUrl:
15 defaultZone: http:// 15 defaultZone: http://
16 -# defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/  
17 -# defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ 16 + # defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/
  17 + # defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/
18 #http://134.224.249.33:1111/eureka/ 正式库 18 #http://134.224.249.33:1111/eureka/ 正式库
19 #http://134.224.249.33:1111/eureka/ 测试库 19 #http://134.224.249.33:1111/eureka/ 测试库
20 #http://127.0.0.1:8761/eureka,http://127.0.0.1:8762/eureka 20 #http://127.0.0.1:8761/eureka,http://127.0.0.1:8762/eureka
21 registry-fetch-interval-seconds: 5 21 registry-fetch-interval-seconds: 5
22 instance-info-replication-interval-seconds: 10 22 instance-info-replication-interval-seconds: 10
23 instance: 23 instance:
24 -# prefer-ip-address: true 24 + # prefer-ip-address: true
25 instance-id: ${spring.application.name} 25 instance-id: ${spring.application.name}
26 -# instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}} #固定端口  
27 -# instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${randomServerPort.value[5000,5005]}} #随机端口 26 + # instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}} #固定端口
  27 + # instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${randomServerPort.value[5000,5005]}} #随机端口
28 lease-renewal-interval-in-seconds: 10 #每隔几秒告诉eureka服务器我还存活，用于心跳检测 28 lease-renewal-interval-in-seconds: 10 #每隔几秒告诉eureka服务器我还存活，用于心跳检测
29 lease-expiration-duration-in-seconds: 10 #如果心跳检测一直没有发送，10秒后会从eureka服务器中将此服务剔除 29 lease-expiration-duration-in-seconds: 10 #如果心跳检测一直没有发送，10秒后会从eureka服务器中将此服务剔除
30 status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/doc.html # ${server.port}为该服务的端口号 30 status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/doc.html # ${server.port}为该服务的端口号
cloud/autho/pom.xml
  Diff comments   View file @e92e5a9
@@ -19,11 +19,11 @@ @@ -19,11 +19,11 @@
19 <artifactId>common</artifactId> 19 <artifactId>common</artifactId>
20 <version>1.0.0</version> 20 <version>1.0.0</version>
21 </dependency> 21 </dependency>
22 -<!-- <dependency>-->  
23 -<!-- <groupId>org.springframework.boot</groupId>-->  
24 -<!-- <artifactId>spring-boot-starter-test</artifactId>-->  
25 -<!-- <scope>test</scope>-->  
26 -<!-- </dependency>--> 22 + <!-- <dependency>-->
  23 + <!-- <groupId>org.springframework.boot</groupId>-->
  24 + <!-- <artifactId>spring-boot-starter-test</artifactId>-->
  25 + <!-- <scope>test</scope>-->
  26 + <!-- </dependency>-->
27 <dependency> 27 <dependency>
28 <groupId>org.springframework.cloud</groupId> 28 <groupId>org.springframework.cloud</groupId>
29 <artifactId>spring-cloud-starter-feign</artifactId> 29 <artifactId>spring-cloud-starter-feign</artifactId>
cloud/autho/src/main/java/com/sincere/autho/Swagger2.java
  Diff comments   View file @e92e5a9
@@ -22,7 +22,7 @@ import java.util.List; @@ -22,7 +22,7 @@ import java.util.List;
22 public class Swagger2 { 22 public class Swagger2 {
23 23
24 @Bean 24 @Bean
25 - public Docket createRestApi() { 25 + public Docket createRestApi() {
26 ParameterBuilder ticketPar = new ParameterBuilder(); 26 ParameterBuilder ticketPar = new ParameterBuilder();
27 List<Parameter> pars = new ArrayList<Parameter>(); 27 List<Parameter> pars = new ArrayList<Parameter>();
28 ticketPar.name("X-Authorization").description("user token") 28 ticketPar.name("X-Authorization").description("user token")
@@ -41,12 +41,13 @@ public class Swagger2 { @@ -41,12 +41,13 @@ public class Swagger2 {
41 .build().globalOperationParameters(pars); 41 .build().globalOperationParameters(pars);
42 42
43 } 43 }
44 - private ApiInfo apiInfo() { 44 +
  45 + private ApiInfo apiInfo() {
45 return new ApiInfoBuilder() 46 return new ApiInfoBuilder()
46 - .title("Spring Boot中使用Swagger2构建RESTful APIs")  
47 - .description("接口文档")  
48 - .termsOfServiceUrl("") 47 + .title("Spring Boot中使用Swagger2构建RESTful APIs")
  48 + .description("接口文档")
  49 + .termsOfServiceUrl("")
49 .version("1.0") 50 .version("1.0")
50 - .build();  
51 - } 51 + .build();
  52 + }
52 } 53 }
cloud/autho/src/main/java/com/sincere/autho/control/LoginController.java
  Diff comments   View file @e92e5a9
@@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.RestController; @@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.RestController;
16 public class LoginController { 16 public class LoginController {
17 17
18 @Autowired 18 @Autowired
19 - LoginService loginService ; 19 + LoginService loginService;
20 20
21 21
22 - @RequestMapping(value = "/login" , method = RequestMethod.POST)  
23 - public BaseDto<String> login(@RequestBody LoginReqDto loginReqDto){ 22 + @RequestMapping(value = "/login", method = RequestMethod.POST)
  23 + public BaseDto<String> login(@RequestBody LoginReqDto loginReqDto) {
24 System.out.println("登录接口"); 24 System.out.println("登录接口");
25 - BaseDto<String> result = new BaseDto<>() ; 25 + BaseDto<String> result = new BaseDto<>();
26 String userId = loginService.login(loginReqDto); 26 String userId = loginService.login(loginReqDto);
27 - if(StringUtils.isNotBlank(userId)){ 27 + if (StringUtils.isNotBlank(userId)) {
28 result.setMessage("登录成功"); 28 result.setMessage("登录成功");
29 result.setData(TokenUtils.buildToken(userId)); 29 result.setData(TokenUtils.buildToken(userId));
30 - }else { 30 + } else {
31 result.setStatus(false); 31 result.setStatus(false);
32 result.setMessage("账号密码错误"); 32 result.setMessage("账号密码错误");
33 } 33 }
34 - return result ; 34 + return result;
35 } 35 }
36 } 36 }
cloud/autho/src/main/java/com/sincere/autho/dto/BaseDto.java
  Diff comments   View file @e92e5a9
@@ -2,9 +2,9 @@ package com.sincere.autho.dto; @@ -2,9 +2,9 @@ package com.sincere.autho.dto;
2 2
3 public class BaseDto<T> { 3 public class BaseDto<T> {
4 4
5 - private String message ;  
6 - private boolean status ;  
7 - private T data ; 5 + private String message;
  6 + private boolean status;
  7 + private T data;
8 8
9 public String getMessage() { 9 public String getMessage() {
10 return message; 10 return message;
@@ -31,6 +31,6 @@ public class BaseDto&lt;T&gt; { @@ -31,6 +31,6 @@ public class BaseDto&lt;T&gt; {
31 } 31 }
32 32
33 public BaseDto() { 33 public BaseDto() {
34 - this.status = true ; 34 + this.status = true;
35 } 35 }
36 } 36 }
cloud/autho/src/main/java/com/sincere/autho/dto/req/LoginReqDto.java
  Diff comments   View file @e92e5a9
@@ -2,9 +2,9 @@ package com.sincere.autho.dto.req; @@ -2,9 +2,9 @@ package com.sincere.autho.dto.req;
2 2
3 public class LoginReqDto { 3 public class LoginReqDto {
4 4
5 - private String account ;  
6 - private String password ;  
7 - private int userType ; // 2:学生；3：家长；其他都是老师 5 + private String account;
  6 + private String password;
  7 + private int userType; // 2:学生；3：家长；其他都是老师
8 8
9 public String getAccount() { 9 public String getAccount() {
10 return account; 10 return account;
cloud/autho/src/main/java/com/sincere/autho/mapper/UserMapper.java
  Diff comments   View file @e92e5a9
@@ -4,9 +4,9 @@ import com.sincere.autho.dto.req.LoginReqDto; @@ -4,9 +4,9 @@ import com.sincere.autho.dto.req.LoginReqDto;
4 4
5 public interface UserMapper { 5 public interface UserMapper {
6 6
7 - String loginTeacher(LoginReqDto loginReqDto) ; 7 + String loginTeacher(LoginReqDto loginReqDto);
8 8
9 - String loginStudent(LoginReqDto loginReqDto) ; 9 + String loginStudent(LoginReqDto loginReqDto);
10 10
11 String loginStudentOthName(LoginReqDto loginReqDto); 11 String loginStudentOthName(LoginReqDto loginReqDto);
12 } 12 }
cloud/autho/src/main/java/com/sincere/autho/service/impl/LoginServiceImpl.java
  Diff comments   View file @e92e5a9
@@ -11,17 +11,17 @@ import org.springframework.util.StringUtils; @@ -11,17 +11,17 @@ import org.springframework.util.StringUtils;
11 public class LoginServiceImpl implements LoginService { 11 public class LoginServiceImpl implements LoginService {
12 12
13 @Autowired 13 @Autowired
14 - UserMapper userMapper ; 14 + UserMapper userMapper;
15 15
16 @Override 16 @Override
17 public String login(LoginReqDto loginReqDto) { 17 public String login(LoginReqDto loginReqDto) {
18 - String userId = "" ;  
19 - if(loginReqDto.getUserType() == 2){ 18 + String userId = "";
  19 + if (loginReqDto.getUserType() == 2) {
20 userId = userMapper.loginStudent(loginReqDto); 20 userId = userMapper.loginStudent(loginReqDto);
21 - if (StringUtils.isEmpty(userId)){//用othername登录 21 + if (StringUtils.isEmpty(userId)) {//用othername登录
22 userId = userMapper.loginStudentOthName(loginReqDto); 22 userId = userMapper.loginStudentOthName(loginReqDto);
23 } 23 }
24 - }else { 24 + } else {
25 userId = userMapper.loginTeacher(loginReqDto); 25 userId = userMapper.loginTeacher(loginReqDto);
26 } 26 }
27 return userId; 27 return userId;
cloud/autho/src/main/resources/bootstrap.yml
  Diff comments   View file @e92e5a9
@@ -6,10 +6,10 @@ server: @@ -6,10 +6,10 @@ server:
6 #服务名称 6 #服务名称
7 spring: 7 spring:
8 application: 8 application:
9 - name: eureka-server1 9 + name: eureka-server1
10 main: 10 main:
11 - allow-bean-definition-overriding: true  
12 - 11 + allow-bean-definition-overriding: true
  12 +
13 13
14 management: 14 management:
15 endpoints: 15 endpoints:
cloud/autho/src/main/resources/mapper/UserMapper.xml
  Diff comments   View file @e92e5a9
@@ -7,11 +7,12 @@ @@ -7,11 +7,12 @@
7 select user_id from SZ_User where mobile = #{account} and pass = #{password} 7 select user_id from SZ_User where mobile = #{account} and pass = #{password}
8 </select> 8 </select>
9 9
10 - <select id="loginStudent" parameterType="com.sincere.autho.dto.req.LoginReqDto" resultType="java.lang.String"> 10 + <select id="loginStudent" parameterType="com.sincere.autho.dto.req.LoginReqDto" resultType="java.lang.String">
11 select user_id from SZ_User where name = #{account} and pass = #{password} 11 select user_id from SZ_User where name = #{account} and pass = #{password}
12 </select> 12 </select>
13 13
14 - <select id="loginStudentOthName" parameterType="com.sincere.autho.dto.req.LoginReqDto" resultType="java.lang.String"> 14 + <select id="loginStudentOthName" parameterType="com.sincere.autho.dto.req.LoginReqDto"
  15 + resultType="java.lang.String">
15 select user_id from SZ_User where othername = #{account} and pass = #{password} 16 select user_id from SZ_User where othername = #{account} and pass = #{password}
16 </select> 17 </select>
17 18
cloud/common/pom.xml
  Diff comments   View file @e92e5a9
@@ -110,16 +110,16 @@ @@ -110,16 +110,16 @@
110 </dependency> 110 </dependency>
111 </dependencies> 111 </dependencies>
112 112
113 - <!-- <build>  
114 - <plugins>  
115 - <plugin>  
116 - <groupId>org.springframework.boot</groupId>  
117 - <artifactId>spring-boot-maven-plugin</artifactId>  
118 - <configuration>  
119 - <classifier>exec</classifier>  
120 - </configuration>  
121 - </plugin>  
122 - </plugins>  
123 - </build>--> 113 + <!-- <build>
  114 + <plugins>
  115 + <plugin>
  116 + <groupId>org.springframework.boot</groupId>
  117 + <artifactId>spring-boot-maven-plugin</artifactId>
  118 + <configuration>
  119 + <classifier>exec</classifier>
  120 + </configuration>
  121 + </plugin>
  122 + </plugins>
  123 + </build>-->
124 124
125 </project> 125 </project>
cloud/common/src/main/java/com/sincere/common/commons/CodeEnum.java
  Diff comments   View file @e92e5a9
@@ -12,7 +12,8 @@ public enum CodeEnum { @@ -12,7 +12,8 @@ public enum CodeEnum {
12 ERROR(1); 12 ERROR(1);
13 13
14 private Integer code; 14 private Integer code;
15 - CodeEnum(Integer code){ 15 +
  16 + CodeEnum(Integer code) {
16 this.code = code; 17 this.code = code;
17 } 18 }
18 19
cloud/common/src/main/java/com/sincere/common/constants/CommonConstants.java
  Diff comments   View file @e92e5a9
@@ -17,5 +17,4 @@ public interface CommonConstants { @@ -17,5 +17,4 @@ public interface CommonConstants {
17 String DEFAULT_PARAMTER_KEY = "parameter"; 17 String DEFAULT_PARAMTER_KEY = "parameter";
18 18
19 19
20 -  
21 } 20 }
cloud/common/src/main/java/com/sincere/common/constants/MqQueueNameConstant.java
  Diff comments   View file @e92e5a9
@@ -9,13 +9,13 @@ public interface MqQueueNameConstant { @@ -9,13 +9,13 @@ public interface MqQueueNameConstant {
9 /** 9 /**
10 * 系统日志队列 10 * 系统日志队列
11 */ 11 */
12 - String SYS_LOG_QUEUE= "sys_log_queue"; 12 + String SYS_LOG_QUEUE = "sys_log_queue";
13 /** 13 /**
14 * 短信验证码队列 14 * 短信验证码队列
15 */ 15 */
16 - String MOBILE_CODE_QUEUE= "mobile_code_queue"; 16 + String MOBILE_CODE_QUEUE = "mobile_code_queue";
17 /** 17 /**
18 * 邮件队列 18 * 邮件队列
19 */ 19 */
20 - String MAIL_CODE_QUEUE= "mail_code_queue"; 20 + String MAIL_CODE_QUEUE = "mail_code_queue";
21 } 21 }
cloud/common/src/main/java/com/sincere/common/constants/SecurityConstants.java
  Diff comments   View file @e92e5a9
@@ -10,52 +10,52 @@ public interface SecurityConstants { @@ -10,52 +10,52 @@ public interface SecurityConstants {
10 /** 10 /**
11 * token的header key 11 * token的header key
12 */ 12 */
13 - String TOKEN_HEADER = "Authorization"; 13 + String TOKEN_HEADER = "Authorization";
14 14
15 - String CLOUD = "panda"; 15 + String CLOUD = "panda";
16 16
17 - String CLOUD_PREFIX = "panda_"; 17 + String CLOUD_PREFIX = "panda_";
18 18
19 /** 19 /**
20 * jwt 加密key 20 * jwt 加密key
21 */ 21 */
22 - String SIGN_KEY = "PANDA"; 22 + String SIGN_KEY = "PANDA";
23 23
24 /** 24 /**
25 * sys_oauth_client_details 字段 25 * sys_oauth_client_details 字段
26 */ 26 */
27 - String CLIENT_FIELDS = "client_id, client_secret, resources_ids, scope, authorized_grant_types,"  
28 - + "web_server_redirect_uri, authorities, access_token_validity,"  
29 - + "refresh_token_validity, addition_information, autoapprove"; 27 + String CLIENT_FIELDS = "client_id, client_secret, resources_ids, scope, authorized_grant_types,"
  28 + + "web_server_redirect_uri, authorities, access_token_validity,"
  29 + + "refresh_token_validity, addition_information, autoapprove";
30 30
31 /** 31 /**
32 * jdbcClientDetailsService查询sql 32 * jdbcClientDetailsService查询sql
33 */ 33 */
34 - String BASE_FIND_STATEMENT = "select " + CLIENT_FIELDS + " from sys_oauth_client_details"; 34 + String BASE_FIND_STATEMENT = "select " + CLIENT_FIELDS + " from sys_oauth_client_details";
35 35
36 /** 36 /**
37 * 默认查询语句 37 * 默认查询语句
38 */ 38 */
39 - String DEFAULT_FIND_STATEMENT = BASE_FIND_STATEMENT + " order by client_id"; 39 + String DEFAULT_FIND_STATEMENT = BASE_FIND_STATEMENT + " order by client_id";
40 40
41 /** 41 /**
42 * 根据client_id查询 42 * 根据client_id查询
43 */ 43 */
44 - String DEFAULT_FIND_STATEMENT_BY_CLIENT_ID = BASE_FIND_STATEMENT + " where client_id = ?"; 44 + String DEFAULT_FIND_STATEMENT_BY_CLIENT_ID = BASE_FIND_STATEMENT + " where client_id = ?";
45 45
46 46
47 - String SPRING_SECURITY_MOBILE_KEY = "mobile"; 47 + String SPRING_SECURITY_MOBILE_KEY = "mobile";
48 48
49 - String SPRING_SECURITY_CODE_KEY = "code"; 49 + String SPRING_SECURITY_CODE_KEY = "code";
50 50
51 /** 51 /**
52 * 手机验证码登录的地址 52 * 手机验证码登录的地址
53 */ 53 */
54 - String SPRING_SECURITY_MOBILE_TOKEN_URL = "/mobile/token"; 54 + String SPRING_SECURITY_MOBILE_TOKEN_URL = "/mobile/token";
55 55
56 56
57 - String REDIS_CODE_PREFIX = "panda_code:"; 57 + String REDIS_CODE_PREFIX = "panda_code:";
58 58
59 - Integer REDIS_CODE_EXPIRE = 60; 59 + Integer REDIS_CODE_EXPIRE = 60;
60 60
61 } 61 }
cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDetailDto.java
  Diff comments   View file @e92e5a9
@@ -10,13 +10,13 @@ import java.util.Date; @@ -10,13 +10,13 @@ import java.util.Date;
10 */ 10 */
11 public class AnalyseDetailDto implements Serializable { 11 public class AnalyseDetailDto implements Serializable {
12 12
13 - private int id ;  
14 - private int analyseId ;  
15 - private String questionNumber ;  
16 - private String questionType ;  
17 - private int difficult ;  
18 - private Double score ;  
19 - private Date createTime ; 13 + private int id;
  14 + private int analyseId;
  15 + private String questionNumber;
  16 + private String questionType;
  17 + private int difficult;
  18 + private Double score;
  19 + private Date createTime;
20 20
21 public int getId() { 21 public int getId() {
22 return id; 22 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDimensionalDto.java
  Diff comments   View file @e92e5a9
@@ -10,12 +10,12 @@ import java.util.Date; @@ -10,12 +10,12 @@ import java.util.Date;
10 */ 10 */
11 public class AnalyseDimensionalDto implements Serializable { 11 public class AnalyseDimensionalDto implements Serializable {
12 12
13 - private int id ;  
14 - private int analyseId ;  
15 - private String questionNumber ;  
16 - private int dimensionalId ;  
17 - private Double score ;  
18 - private Date createTime ; 13 + private int id;
  14 + private int analyseId;
  15 + private String questionNumber;
  16 + private int dimensionalId;
  17 + private Double score;
  18 + private Date createTime;
19 19
20 public int getId() { 20 public int getId() {
21 return id; 21 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDto.java
  Diff comments   View file @e92e5a9
@@ -10,14 +10,14 @@ import java.util.Date; @@ -10,14 +10,14 @@ import java.util.Date;
10 */ 10 */
11 public class AnalyseDto implements Serializable { 11 public class AnalyseDto implements Serializable {
12 12
13 - private int id ;  
14 - private String examName ;  
15 - private String examTime ;  
16 - private String courseName ;  
17 - private Date createTime ;  
18 - private Double maxScore ;  
19 - private String grade ;  
20 - private String examScope ; 13 + private int id;
  14 + private String examName;
  15 + private String examTime;
  16 + private String courseName;
  17 + private Date createTime;
  18 + private Double maxScore;
  19 + private String grade;
  20 + private String examScope;
21 21
22 public int getId() { 22 public int getId() {
23 return id; 23 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/ChapterDto.java
  Diff comments   View file @e92e5a9
@@ -9,13 +9,13 @@ import java.io.Serializable; @@ -9,13 +9,13 @@ import java.io.Serializable;
9 */ 9 */
10 public class ChapterDto implements Serializable { 10 public class ChapterDto implements Serializable {
11 11
12 - private int id ;  
13 - private int analyseId ;  
14 - private int chapterNumber ;  
15 - private String chapterName ;  
16 - private Double chapterScore ; 12 + private int id;
  13 + private int analyseId;
  14 + private int chapterNumber;
  15 + private String chapterName;
  16 + private Double chapterScore;
17 17
18 - private Double percent ; 18 + private Double percent;
19 19
20 public int getId() { 20 public int getId() {
21 return id; 21 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/ClassCourseDto.java
  Diff comments   View file @e92e5a9
@@ -30,9 +30,9 @@ public class ClassCourseDto implements Serializable { @@ -30,9 +30,9 @@ public class ClassCourseDto implements Serializable {
30 30
31 private Date updateTime; 31 private Date updateTime;
32 32
33 - private String team ; 33 + private String team;
34 34
35 - private int courseOpenId ; 35 + private int courseOpenId;
36 36
37 public Integer getCourseId() { 37 public Integer getCourseId() {
38 return courseId; 38 return courseId;
cloud/common/src/main/java/com/sincere/common/dto/independence/CourseDto.java
  Diff comments   View file @e92e5a9
@@ -9,10 +9,10 @@ import java.io.Serializable; @@ -9,10 +9,10 @@ import java.io.Serializable;
9 */ 9 */
10 public class CourseDto implements Serializable { 10 public class CourseDto implements Serializable {
11 11
12 - private int id ;  
13 - private int schoolId ;  
14 - private int courseId ;  
15 - private String courseName ; 12 + private int id;
  13 + private int schoolId;
  14 + private int courseId;
  15 + private String courseName;
16 private int courseType; 16 private int courseType;
17 17
18 public int getCourseId() { 18 public int getCourseId() {
cloud/common/src/main/java/com/sincere/common/dto/independence/GetLearnDto.java
  Diff comments   View file @e92e5a9
@@ -9,8 +9,8 @@ import java.io.Serializable; @@ -9,8 +9,8 @@ import java.io.Serializable;
9 */ 9 */
10 public class GetLearnDto implements Serializable { 10 public class GetLearnDto implements Serializable {
11 11
12 - private int analyseId ;  
13 - private String schoolName ; 12 + private int analyseId;
  13 + private String schoolName;
14 14
15 public int getAnalyseId() { 15 public int getAnalyseId() {
16 return analyseId; 16 return analyseId;
cloud/common/src/main/java/com/sincere/common/dto/independence/JoinClassDto.java
  Diff comments   View file @e92e5a9
@@ -9,13 +9,13 @@ import java.io.Serializable; @@ -9,13 +9,13 @@ import java.io.Serializable;
9 */ 9 */
10 public class JoinClassDto implements Serializable { 10 public class JoinClassDto implements Serializable {
11 11
12 - private int id ;  
13 - private int schoolId ;  
14 - private int classId ;  
15 - private String team ;  
16 - private int courseId ;  
17 - private String courseName ;  
18 - private int courseGroup ; 12 + private int id;
  13 + private int schoolId;
  14 + private int classId;
  15 + private String team;
  16 + private int courseId;
  17 + private String courseName;
  18 + private int courseGroup;
19 19
20 public int getId() { 20 public int getId() {
21 return id; 21 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/LeagueDto.java
  Diff comments   View file @e92e5a9
@@ -9,10 +9,10 @@ import java.io.Serializable; @@ -9,10 +9,10 @@ import java.io.Serializable;
9 */ 9 */
10 public class LeagueDto implements Serializable { 10 public class LeagueDto implements Serializable {
11 11
12 - private int id ;  
13 - private int analyseId ;  
14 - private String league ;  
15 - private String schoolName ; 12 + private int id;
  13 + private int analyseId;
  14 + private String league;
  15 + private String schoolName;
16 16
17 public int getId() { 17 public int getId() {
18 return id; 18 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/ScheduleDto.java
  Diff comments   View file @e92e5a9
@@ -10,16 +10,16 @@ import java.util.Date; @@ -10,16 +10,16 @@ import java.util.Date;
10 */ 10 */
11 public class ScheduleDto implements Serializable { 11 public class ScheduleDto implements Serializable {
12 12
13 - private int id ;  
14 - private String scheduleName ;  
15 - private int schoolId ;  
16 - private String team ;  
17 - private Date createTime ;  
18 - private Date updateTime ;  
19 - private int speed ;  
20 - private int morning ; 13 + private int id;
  14 + private String scheduleName;
  15 + private int schoolId;
  16 + private String team;
  17 + private Date createTime;
  18 + private Date updateTime;
  19 + private int speed;
  20 + private int morning;
21 private int afternoon; 21 private int afternoon;
22 - private int night ; 22 + private int night;
23 23
24 public int getId() { 24 public int getId() {
25 return id; 25 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDetailDto.java
  Diff comments   View file @e92e5a9
@@ -10,17 +10,17 @@ import java.util.Date; @@ -10,17 +10,17 @@ import java.util.Date;
10 */ 10 */
11 public class StudentDetailDto implements Serializable { 11 public class StudentDetailDto implements Serializable {
12 12
13 - private long id ; 13 + private long id;
14 private int openId; 14 private int openId;
15 - private String schoolName ;  
16 - private String className ;  
17 - private String studentName ;  
18 - private String studentNumber ;  
19 - private int analyseId ;  
20 - private String examNumber ;  
21 - private Double score ;  
22 - private Date createTime ;  
23 - private int correct ; //1 正确 0 错误 15 + private String schoolName;
  16 + private String className;
  17 + private String studentName;
  18 + private String studentNumber;
  19 + private int analyseId;
  20 + private String examNumber;
  21 + private Double score;
  22 + private Date createTime;
  23 + private int correct; //1 正确 0 错误
24 24
25 public long getId() { 25 public long getId() {
26 return id; 26 return id;
cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDto.java
  Diff comments   View file @e92e5a9
@@ -10,15 +10,15 @@ import java.util.Date; @@ -10,15 +10,15 @@ import java.util.Date;
10 */ 10 */
11 public class StudentDto implements Serializable { 11 public class StudentDto implements Serializable {
12 12
13 - private int id ; 13 + private int id;
14 private int openId; 14 private int openId;
15 - private String schoolName ;  
16 - private String className ;  
17 - private String studentName ;  
18 - private String studentNumber ;  
19 - private int analyseId ;  
20 - private double score ;  
21 - private Date createTime ; 15 + private String schoolName;
  16 + private String className;
  17 + private String studentName;
  18 + private String studentNumber;
  19 + private int analyseId;
  20 + private double score;
  21 + private Date createTime;
22 22
23 23
24 public int getId() { 24 public int getId() {
cloud/common/src/main/java/com/sincere/common/dto/independence/TeacherClassDto.java
  Diff comments   View file @e92e5a9
@@ -30,9 +30,9 @@ public class TeacherClassDto implements Serializable { @@ -30,9 +30,9 @@ public class TeacherClassDto implements Serializable {
30 30
31 private Date createTime; 31 private Date createTime;
32 32
33 - private String team ; 33 + private String team;
34 34
35 - private int status ; 35 + private int status;
36 36
37 public Integer gettClassId() { 37 public Integer gettClassId() {
38 return tClassId; 38 return tClassId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/AppDto.java
  Diff comments   View file @e92e5a9
@@ -6,10 +6,10 @@ package com.sincere.common.dto.smartCampus; @@ -6,10 +6,10 @@ package com.sincere.common.dto.smartCampus;
6 * @date 2019/11/28 0028 15:58 6 * @date 2019/11/28 0028 15:58
7 */ 7 */
8 public class AppDto { 8 public class AppDto {
9 - private String agentId ;  
10 - private String agentSecret ;  
11 - private String qyhId ;  
12 - private String agentKey ; 9 + private String agentId;
  10 + private String agentSecret;
  11 + private String qyhId;
  12 + private String agentKey;
13 13
14 public String getAgentId() { 14 public String getAgentId() {
15 return agentId; 15 return agentId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/BindPushDto.java
  Diff comments   View file @e92e5a9
@@ -9,14 +9,14 @@ import java.util.Date; @@ -9,14 +9,14 @@ import java.util.Date;
9 */ 9 */
10 public class BindPushDto { 10 public class BindPushDto {
11 11
12 - private int schoolId ;  
13 - private String schoolName ;  
14 - private int type ; // 0是企业号，1是钉钉  
15 - private Date beginDate ;  
16 - private Date endDate ;  
17 - private int intervalDays ;  
18 - private String pushTime ;  
19 - private String msg ; 12 + private int schoolId;
  13 + private String schoolName;
  14 + private int type; // 0是企业号，1是钉钉
  15 + private Date beginDate;
  16 + private Date endDate;
  17 + private int intervalDays;
  18 + private String pushTime;
  19 + private String msg;
20 20
21 public int getSchoolId() { 21 public int getSchoolId() {
22 return schoolId; 22 return schoolId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java
  Diff comments   View file @e92e5a9
@@ -6,9 +6,9 @@ package com.sincere.common.dto.smartCampus; @@ -6,9 +6,9 @@ package com.sincere.common.dto.smartCampus;
6 * @date 2019/11/29 0029 14:27 6 * @date 2019/11/29 0029 14:27
7 */ 7 */
8 public class CensusKqDto { 8 public class CensusKqDto {
9 - private String targetName ;  
10 - private int leaveCount ;  
11 - private int notAttendCount ; 9 + private String targetName;
  10 + private int leaveCount;
  11 + private int notAttendCount;
12 12
13 public String getTargetName() { 13 public String getTargetName() {
14 return targetName; 14 return targetName;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/DeptRelationDto.java
  Diff comments   View file @e92e5a9
@@ -8,11 +8,11 @@ package com.sincere.common.dto.smartCampus; @@ -8,11 +8,11 @@ package com.sincere.common.dto.smartCampus;
8 public class DeptRelationDto { 8 public class DeptRelationDto {
9 9
10 private int hxyDeptId; 10 private int hxyDeptId;
11 - private String yxyDeptId ;  
12 - private int userType ;  
13 - private int state ; 11 + private String yxyDeptId;
  12 + private int userType;
  13 + private int state;
14 14
15 - private int sqlStatus ; // 1增2改3删 15 + private int sqlStatus; // 1增2改3删
16 16
17 public int getHxyDeptId() { 17 public int getHxyDeptId() {
18 return hxyDeptId; 18 return hxyDeptId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/GroupDto.java
  Diff comments   View file @e92e5a9
@@ -7,9 +7,9 @@ package com.sincere.common.dto.smartCampus; @@ -7,9 +7,9 @@ package com.sincere.common.dto.smartCampus;
7 */ 7 */
8 public class GroupDto { 8 public class GroupDto {
9 9
10 - private int groupId ;  
11 - private String groupName ;  
12 - private int pId ; 10 + private int groupId;
  11 + private String groupName;
  12 + private int pId;
13 13
14 public int getGroupId() { 14 public int getGroupId() {
15 return groupId; 15 return groupId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/KqDto.java
  Diff comments   View file @e92e5a9
@@ -6,10 +6,10 @@ package com.sincere.common.dto.smartCampus; @@ -6,10 +6,10 @@ package com.sincere.common.dto.smartCampus;
6 * @date 2019/12/5 0005 11:01 6 * @date 2019/12/5 0005 11:01
7 */ 7 */
8 public class KqDto { 8 public class KqDto {
9 - private String userId ;  
10 - private String type ;  
11 - private String templateId ;  
12 - private String endTime ; 9 + private String userId;
  10 + private String type;
  11 + private String templateId;
  12 + private String endTime;
13 13
14 14
15 public String getUserId() { 15 public String getUserId() {
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/KqTeacherDto.java
  Diff comments   View file @e92e5a9
@@ -6,17 +6,17 @@ package com.sincere.common.dto.smartCampus; @@ -6,17 +6,17 @@ package com.sincere.common.dto.smartCampus;
6 * @date 2019/11/28 0028 9:10 6 * @date 2019/11/28 0028 9:10
7 */ 7 */
8 public class KqTeacherDto { 8 public class KqTeacherDto {
9 - private String userId ;  
10 - private int schoolId ;  
11 - private String name ;  
12 - private String mobile ;  
13 - private String pass ;  
14 - private String openId ;  
15 - private String face ;  
16 -  
17 - private int classId ;  
18 - private int roomId ;  
19 - private String targetName ; 9 + private String userId;
  10 + private int schoolId;
  11 + private String name;
  12 + private String mobile;
  13 + private String pass;
  14 + private String openId;
  15 + private String face;
  16 +
  17 + private int classId;
  18 + private int roomId;
  19 + private String targetName;
20 20
21 public String getUserId() { 21 public String getUserId() {
22 return userId; 22 return userId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/ParentDto.java
  Diff comments   View file @e92e5a9
@@ -7,8 +7,8 @@ package com.sincere.common.dto.smartCampus; @@ -7,8 +7,8 @@ package com.sincere.common.dto.smartCampus;
7 */ 7 */
8 public class ParentDto { 8 public class ParentDto {
9 9
10 - private int schoolId ;  
11 - private String mobile ; 10 + private int schoolId;
  11 + private String mobile;
12 12
13 public int getSchoolId() { 13 public int getSchoolId() {
14 return schoolId; 14 return schoolId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/SZ_AttendanceDto.java
  Diff comments   View file @e92e5a9
@@ -23,10 +23,10 @@ public class SZ_AttendanceDto { @@ -23,10 +23,10 @@ public class SZ_AttendanceDto {
23 23
24 private int IsKaoqin; 24 private int IsKaoqin;
25 25
26 - private String ip ;  
27 - private int port ; 26 + private String ip;
  27 + private int port;
28 28
29 - private int outOrIn ; 29 + private int outOrIn;
30 30
31 public int getOutOrIn() { 31 public int getOutOrIn() {
32 return outOrIn; 32 return outOrIn;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/SchoolDto.java
  Diff comments   View file @e92e5a9
@@ -9,9 +9,9 @@ import java.io.Serializable; @@ -9,9 +9,9 @@ import java.io.Serializable;
9 */ 9 */
10 public class SchoolDto implements Serializable { 10 public class SchoolDto implements Serializable {
11 11
12 - private int schoolId ;  
13 - private String schoolName ;  
14 - private int managerUserId ; 12 + private int schoolId;
  13 + private String schoolName;
  14 + private int managerUserId;
15 15
16 public int getManagerUserId() { 16 public int getManagerUserId() {
17 return managerUserId; 17 return managerUserId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/StudentBean.java
  Diff comments   View file @e92e5a9
@@ -39,7 +39,7 @@ public class StudentBean implements Serializable { @@ -39,7 +39,7 @@ public class StudentBean implements Serializable {
39 39
40 private Date AddTime; 40 private Date AddTime;
41 41
42 - private int Sex; 42 + private int Sex;
43 43
44 private String Face; 44 private String Face;
45 45
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/StudentCardDto.java
  Diff comments   View file @e92e5a9
@@ -9,8 +9,8 @@ import java.io.Serializable; @@ -9,8 +9,8 @@ import java.io.Serializable;
9 */ 9 */
10 public class StudentCardDto implements Serializable { 10 public class StudentCardDto implements Serializable {
11 11
12 - private String cardType ;  
13 - private String cardNum ; 12 + private String cardType;
  13 + private String cardNum;
14 14
15 public String getCardType() { 15 public String getCardType() {
16 return cardType; 16 return cardType;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/SyncDeptDto.java
  Diff comments   View file @e92e5a9
@@ -6,13 +6,13 @@ package com.sincere.common.dto.smartCampus; @@ -6,13 +6,13 @@ package com.sincere.common.dto.smartCampus;
6 * @date 2019/12/27 0027 9:28 6 * @date 2019/12/27 0027 9:28
7 */ 7 */
8 public class SyncDeptDto { 8 public class SyncDeptDto {
9 - private int id ;  
10 - private int deptId ;  
11 - private int schoolId ;  
12 - private String deptName ;  
13 - private int updateType ;  
14 - private int gradeId ;  
15 - private int userType ; 9 + private int id;
  10 + private int deptId;
  11 + private int schoolId;
  12 + private String deptName;
  13 + private int updateType;
  14 + private int gradeId;
  15 + private int userType;
16 16
17 public int getId() { 17 public int getId() {
18 return id; 18 return id;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/SyncSchoolDto.java
  Diff comments   View file @e92e5a9
@@ -7,10 +7,10 @@ package com.sincere.common.dto.smartCampus; @@ -7,10 +7,10 @@ package com.sincere.common.dto.smartCampus;
7 */ 7 */
8 public class SyncSchoolDto { 8 public class SyncSchoolDto {
9 9
10 - private int schoolId ;  
11 - private String schoolName ;  
12 - private String yxtId ;  
13 - private int push ; 10 + private int schoolId;
  11 + private String schoolName;
  12 + private String yxtId;
  13 + private int push;
14 14
15 public int getSchoolId() { 15 public int getSchoolId() {
16 return schoolId; 16 return schoolId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/SyncUserDto.java
  Diff comments   View file @e92e5a9
@@ -7,15 +7,15 @@ package com.sincere.common.dto.smartCampus; @@ -7,15 +7,15 @@ package com.sincere.common.dto.smartCampus;
7 */ 7 */
8 public class SyncUserDto { 8 public class SyncUserDto {
9 9
10 - private int id ;  
11 - private String name ;  
12 - private String customerId ;  
13 - private int userType ;  
14 - private int classId ;  
15 - private int sex ;  
16 - private String mobile ;  
17 - private int updateType ;  
18 - private String yxyUserId ; 10 + private int id;
  11 + private String name;
  12 + private String customerId;
  13 + private int userType;
  14 + private int classId;
  15 + private int sex;
  16 + private String mobile;
  17 + private int updateType;
  18 + private String yxyUserId;
19 19
20 public String getYxyUserId() { 20 public String getYxyUserId() {
21 return yxyUserId; 21 return yxyUserId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/TemplateDto.java
  Diff comments   View file @e92e5a9
@@ -9,11 +9,11 @@ import java.io.Serializable; @@ -9,11 +9,11 @@ import java.io.Serializable;
9 */ 9 */
10 public class TemplateDto implements Serializable { 10 public class TemplateDto implements Serializable {
11 11
12 - private int id ;  
13 - private String title ;  
14 - private String config ;  
15 - private int schoolId ;  
16 - private String type ; 12 + private int id;
  13 + private String title;
  14 + private String config;
  15 + private int schoolId;
  16 + private String type;
17 17
18 public String getTitle() { 18 public String getTitle() {
19 return title; 19 return title;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/UpdateCardDto.java
  Diff comments   View file @e92e5a9
@@ -9,9 +9,9 @@ import java.io.Serializable; @@ -9,9 +9,9 @@ import java.io.Serializable;
9 */ 9 */
10 public class UpdateCardDto implements Serializable { 10 public class UpdateCardDto implements Serializable {
11 11
12 - private int id ;  
13 - private int userType ;  
14 - private String oldCard ; 12 + private int id;
  13 + private int userType;
  14 + private String oldCard;
15 15
16 public int getId() { 16 public int getId() {
17 return id; 17 return id;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/UserDto.java
  Diff comments   View file @e92e5a9
@@ -10,9 +10,9 @@ import java.io.Serializable; @@ -10,9 +10,9 @@ import java.io.Serializable;
10 public class UserDto implements Serializable { 10 public class UserDto implements Serializable {
11 11
12 private int schoolId; 12 private int schoolId;
13 - private int classId ;  
14 - private String name ;  
15 - private int studentId ; 13 + private int classId;
  14 + private String name;
  15 + private int studentId;
16 16
17 public int getSchoolId() { 17 public int getSchoolId() {
18 return schoolId; 18 return schoolId;
cloud/common/src/main/java/com/sincere/common/dto/smartCampus/UserRelationDto.java
  Diff comments   View file @e92e5a9
@@ -7,12 +7,12 @@ package com.sincere.common.dto.smartCampus; @@ -7,12 +7,12 @@ package com.sincere.common.dto.smartCampus;
7 */ 7 */
8 public class UserRelationDto { 8 public class UserRelationDto {
9 9
10 - private String hxyCustomerId ;  
11 - private String yxyUserId ;  
12 - private int userType ;  
13 - private int state ; 10 + private String hxyCustomerId;
  11 + private String yxyUserId;
  12 + private int userType;
  13 + private int state;
14 14
15 - private int sqlstate ; 15 + private int sqlstate;
16 16
17 public String getHxyCustomerId() { 17 public String getHxyCustomerId() {
18 return hxyCustomerId; 18 return hxyCustomerId;
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/CheckInDto.java
  Diff comments   View file @e92e5a9
@@ -9,11 +9,11 @@ import java.io.Serializable; @@ -9,11 +9,11 @@ import java.io.Serializable;
9 */ 9 */
10 public class CheckInDto implements Serializable { 10 public class CheckInDto implements Serializable {
11 11
12 - private String deviceId ;  
13 - private String cardNo ;  
14 - private int funNo ;  
15 - private int flag ;  
16 - private String checkTime ; 12 + private String deviceId;
  13 + private String cardNo;
  14 + private int funNo;
  15 + private int flag;
  16 + private String checkTime;
17 17
18 18
19 public String getDeviceId() { 19 public String getDeviceId() {
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/CheckOutDto.java
  Diff comments   View file @e92e5a9
@@ -10,7 +10,7 @@ import java.io.Serializable; @@ -10,7 +10,7 @@ import java.io.Serializable;
10 public class CheckOutDto implements Serializable { 10 public class CheckOutDto implements Serializable {
11 11
12 private String out; 12 private String out;
13 - private int isSuccess ; 13 + private int isSuccess;
14 14
15 public String getOut() { 15 public String getOut() {
16 return out; 16 return out;
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/FingerDto.java
  Diff comments   View file @e92e5a9
@@ -9,9 +9,9 @@ import java.util.Date; @@ -9,9 +9,9 @@ import java.util.Date;
9 */ 9 */
10 public class FingerDto { 10 public class FingerDto {
11 11
12 - private int studentId ;  
13 - private String orderMsg ;  
14 - private Date createTime ; 12 + private int studentId;
  13 + private String orderMsg;
  14 + private Date createTime;
15 15
16 public Date getCreateTime() { 16 public Date getCreateTime() {
17 return createTime; 17 return createTime;
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/PassFailDto.java
  Diff comments   View file @e92e5a9
@@ -10,13 +10,13 @@ import java.util.Date; @@ -10,13 +10,13 @@ import java.util.Date;
10 */ 10 */
11 public class PassFailDto implements Serializable { 11 public class PassFailDto implements Serializable {
12 12
13 - private String cardNum ;  
14 - private String deviceId ;  
15 - private String direction ;  
16 - private String resultIntro ;  
17 - private Date createTime ;  
18 - private int schoolId ;  
19 - private Date inTime ; 13 + private String cardNum;
  14 + private String deviceId;
  15 + private String direction;
  16 + private String resultIntro;
  17 + private Date createTime;
  18 + private int schoolId;
  19 + private Date inTime;
20 20
21 public String getCardNum() { 21 public String getCardNum() {
22 return cardNum; 22 return cardNum;
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/SendFailDto.java
  Diff comments   View file @e92e5a9
@@ -15,48 +15,48 @@ import java.util.Date; @@ -15,48 +15,48 @@ import java.util.Date;
15 */ 15 */
16 public class SendFailDto implements Serializable { 16 public class SendFailDto implements Serializable {
17 17
18 - private String deviceId ;  
19 - private String cardNum ;  
20 - private String oldCardNum ;  
21 - private String cardType ;  
22 - private int customerId ;  
23 - private int userType ;  
24 - private int classId ;  
25 - private String schoolName ;  
26 - private int studentType ;  
27 - private int openFlag ;  
28 - private int status ;  
29 - private int updateId ;  
30 - private Date createTime ;  
31 - private int sex ;  
32 - private String name ;  
33 - private int failType ;  
34 - private String failContent ;  
35 - private int schoolId ;  
36 - private int shiduan ; 18 + private String deviceId;
  19 + private String cardNum;
  20 + private String oldCardNum;
  21 + private String cardType;
  22 + private int customerId;
  23 + private int userType;
  24 + private int classId;
  25 + private String schoolName;
  26 + private int studentType;
  27 + private int openFlag;
  28 + private int status;
  29 + private int updateId;
  30 + private Date createTime;
  31 + private int sex;
  32 + private String name;
  33 + private int failType;
  34 + private String failContent;
  35 + private int schoolId;
  36 + private int shiduan;
37 37
38 public SendFailDto() { 38 public SendFailDto() {
39 } 39 }
40 40
41 - public SendFailDto(UserDto user , SchoolDto school , StudentCardDto studentCard , UpdateCardDto updateCard) {  
42 - if(updateCard != null){ 41 + public SendFailDto(UserDto user, SchoolDto school, StudentCardDto studentCard, UpdateCardDto updateCard) {
  42 + if (updateCard != null) {
43 oldCardNum = updateCard.getOldCard(); 43 oldCardNum = updateCard.getOldCard();
44 - userType = updateCard.getUserType() ; 44 + userType = updateCard.getUserType();
45 } 45 }
46 - if(studentCard != null){ 46 + if (studentCard != null) {
47 cardType = studentCard.getCardType(); 47 cardType = studentCard.getCardType();
48 } 48 }
49 - if(user != null){ 49 + if (user != null) {
50 customerId = user.getStudentId(); 50 customerId = user.getStudentId();
51 classId = user.getClassId(); 51 classId = user.getClassId();
52 schoolId = user.getSchoolId(); 52 schoolId = user.getSchoolId();
53 name = user.getName(); 53 name = user.getName();
54 } 54 }
55 - if(school != null){ 55 + if (school != null) {
56 schoolName = school.getSchoolName(); 56 schoolName = school.getSchoolName();
57 } 57 }
58 createTime = new Date(); 58 createTime = new Date();
59 - studentType =1 ; 59 + studentType = 1;
60 sex = 1; 60 sex = 1;
61 } 61 }
62 62
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/SendMessageDto.java
  Diff comments   View file @e92e5a9
@@ -10,15 +10,15 @@ import java.util.Date; @@ -10,15 +10,15 @@ import java.util.Date;
10 */ 10 */
11 public class SendMessageDto implements Serializable { 11 public class SendMessageDto implements Serializable {
12 12
13 - private long id ;  
14 - private String deviceId ;  
15 - private String cardNo ;  
16 - private long index ;  
17 - private String send ;  
18 - private String result ;  
19 - private int correct ;  
20 - private Date createTime ;  
21 - private String functionId ; 13 + private long id;
  14 + private String deviceId;
  15 + private String cardNo;
  16 + private long index;
  17 + private String send;
  18 + private String result;
  19 + private int correct;
  20 + private Date createTime;
  21 + private String functionId;
22 22
23 public long getId() { 23 public long getId() {
24 return id; 24 return id;
cloud/common/src/main/java/com/sincere/common/dto/xiaoan/SendSuccessDto.java
  Diff comments   View file @e92e5a9
@@ -15,46 +15,46 @@ import java.util.Date; @@ -15,46 +15,46 @@ import java.util.Date;
15 */ 15 */
16 public class SendSuccessDto implements Serializable { 16 public class SendSuccessDto implements Serializable {
17 17
18 - private String deviceId ;  
19 - private String cardNum ;  
20 - private String oldCardNum ;  
21 - private String cardType ;  
22 - private int customerId ;  
23 - private int userType ;  
24 - private int classId ;  
25 - private String schoolName ;  
26 - private int studentType ;  
27 - private int openFlag ;  
28 - private int status ;  
29 - private int updateId ;  
30 - private Date createTime ;  
31 - private int sex ;  
32 - private String name ;  
33 - private int schoolId ;  
34 - private int shiduan ; 18 + private String deviceId;
  19 + private String cardNum;
  20 + private String oldCardNum;
  21 + private String cardType;
  22 + private int customerId;
  23 + private int userType;
  24 + private int classId;
  25 + private String schoolName;
  26 + private int studentType;
  27 + private int openFlag;
  28 + private int status;
  29 + private int updateId;
  30 + private Date createTime;
  31 + private int sex;
  32 + private String name;
  33 + private int schoolId;
  34 + private int shiduan;
35 35
36 public SendSuccessDto() { 36 public SendSuccessDto() {
37 } 37 }
38 38
39 - public SendSuccessDto(UserDto user , SchoolDto school , StudentCardDto studentCard , UpdateCardDto updateCard) {  
40 - if(updateCard != null){ 39 + public SendSuccessDto(UserDto user, SchoolDto school, StudentCardDto studentCard, UpdateCardDto updateCard) {
  40 + if (updateCard != null) {
41 oldCardNum = updateCard.getOldCard(); 41 oldCardNum = updateCard.getOldCard();
42 - userType = updateCard.getUserType() ; 42 + userType = updateCard.getUserType();
43 } 43 }
44 - if(studentCard != null){ 44 + if (studentCard != null) {
45 cardType = studentCard.getCardType(); 45 cardType = studentCard.getCardType();
46 } 46 }
47 - if(user != null){ 47 + if (user != null) {
48 customerId = user.getStudentId(); 48 customerId = user.getStudentId();
49 classId = user.getClassId(); 49 classId = user.getClassId();
50 schoolId = user.getSchoolId(); 50 schoolId = user.getSchoolId();
51 name = user.getName(); 51 name = user.getName();
52 } 52 }
53 - if(school != null){ 53 + if (school != null) {
54 schoolName = school.getSchoolName(); 54 schoolName = school.getSchoolName();
55 } 55 }
56 createTime = new Date(); 56 createTime = new Date();
57 - studentType =1 ; 57 + studentType = 1;
58 sex = 1; 58 sex = 1;
59 } 59 }
60 60
cloud/common/src/main/java/com/sincere/common/enums/ApiErrorCodeEnum.java
  Diff comments   View file @e92e5a9
1 package com.sincere.common.enums; 1 package com.sincere.common.enums;
  2 +
2 /** 3 /**
3 * @author yukong 4 * @author yukong
4 * @date 2019-04-20 18:54 5 * @date 2019-04-20 18:54
5 */ 6 */
6 -public enum ApiErrorCodeEnum{ 7 +public enum ApiErrorCodeEnum {
7 /** 8 /**
8 * 失败 9 * 失败
9 */ 10 */
cloud/common/src/main/java/com/sincere/common/enums/DataStatusEnum.java
  Diff comments   View file @e92e5a9
@@ -8,7 +8,7 @@ package com.sincere.common.enums; @@ -8,7 +8,7 @@ package com.sincere.common.enums;
8 public enum DataStatusEnum { 8 public enum DataStatusEnum {
9 9
10 NORMAL("0", "正常"), 10 NORMAL("0", "正常"),
11 - LOCK("1","删除"); 11 + LOCK("1", "删除");
12 12
13 13
14 private String code; 14 private String code;
cloud/common/src/main/java/com/sincere/common/enums/DifficultEnums.java
  Diff comments   View file @e92e5a9
@@ -2,19 +2,20 @@ package com.sincere.common.enums; @@ -2,19 +2,20 @@ package com.sincere.common.enums;
2 2
3 /** 3 /**
4 * 学情分析 题目困难程度 4 * 学情分析 题目困难程度
  5 + *
5 * @author chen 6 * @author chen
6 * @version 1.0 1 7 * @version 1.0 1
7 * @date 2019/10/18 0018 8:40 8 * @date 2019/10/18 0018 8:40
8 */ 9 */
9 public enum DifficultEnums { 10 public enum DifficultEnums {
10 11
11 - easy(1,"易","认知"),  
12 - medium(2,"中","理解"),  
13 - difficult(3,"难","应用"); 12 + easy(1, "易", "认知"),
  13 + medium(2, "中", "理解"),
  14 + difficult(3, "难", "应用");
14 15
15 - private int difficultType ;  
16 - private String difficultName ;  
17 - private String difficultShow ; 16 + private int difficultType;
  17 + private String difficultName;
  18 + private String difficultShow;
18 19
19 DifficultEnums(int difficultType, String difficultName, String difficultShow) { 20 DifficultEnums(int difficultType, String difficultName, String difficultShow) {
20 this.difficultType = difficultType; 21 this.difficultType = difficultType;
@@ -46,21 +47,21 @@ public enum DifficultEnums { @@ -46,21 +47,21 @@ public enum DifficultEnums {
46 this.difficultName = difficultName; 47 this.difficultName = difficultName;
47 } 48 }
48 49
49 - public static int getDifficultType(String difficultName){ 50 + public static int getDifficultType(String difficultName) {
50 for (DifficultEnums difficultEnums : DifficultEnums.values()) { 51 for (DifficultEnums difficultEnums : DifficultEnums.values()) {
51 if (difficultEnums.getDifficultName().equals(difficultName)) { 52 if (difficultEnums.getDifficultName().equals(difficultName)) {
52 return difficultEnums.getDifficultType(); 53 return difficultEnums.getDifficultType();
53 } 54 }
54 } 55 }
55 - return 0 ; 56 + return 0;
56 } 57 }
57 58
58 - public static String getDifficultName(int difficultType){ 59 + public static String getDifficultName(int difficultType) {
59 for (DifficultEnums difficultEnums : DifficultEnums.values()) { 60 for (DifficultEnums difficultEnums : DifficultEnums.values()) {
60 if (difficultEnums.getDifficultType() == difficultType) { 61 if (difficultEnums.getDifficultType() == difficultType) {
61 return difficultEnums.getDifficultName(); 62 return difficultEnums.getDifficultName();
62 } 63 }
63 } 64 }
64 - return "" ; 65 + return "";
65 } 66 }
66 } 67 }
cloud/common/src/main/java/com/sincere/common/enums/DimensionalEnums.java
  Diff comments   View file @e92e5a9
@@ -2,18 +2,19 @@ package com.sincere.common.enums; @@ -2,18 +2,19 @@ package com.sincere.common.enums;
2 2
3 /** 3 /**
4 * 学情分析 四维细目 4 * 学情分析 四维细目
  5 + *
5 * @author chen 6 * @author chen
6 * @version 1.0 7 * @version 1.0
7 * @date 2019/10/18 0018 8:33 8 * @date 2019/10/18 0018 8:33
8 */ 9 */
9 public enum DimensionalEnums { 10 public enum DimensionalEnums {
10 - knowledge(1,"知识点"),  
11 - ability(2,"能力"),  
12 - skill(3,"技能"),  
13 - think(4,"四维"); 11 + knowledge(1, "知识点"),
  12 + ability(2, "能力"),
  13 + skill(3, "技能"),
  14 + think(4, "四维");
14 15
15 - private int dimensionalType ;  
16 - private String dimensionalName ; 16 + private int dimensionalType;
  17 + private String dimensionalName;
17 18
18 DimensionalEnums(int dimensionalType, String dimensionalName) { 19 DimensionalEnums(int dimensionalType, String dimensionalName) {
19 this.dimensionalType = dimensionalType; 20 this.dimensionalType = dimensionalType;
cloud/common/src/main/java/com/sincere/common/enums/JobDataStatusEnum.java
  Diff comments   View file @e92e5a9
@@ -15,7 +15,7 @@ public enum JobDataStatusEnum { @@ -15,7 +15,7 @@ public enum JobDataStatusEnum {
15 /** 15 /**
16 * 停止 16 * 停止
17 */ 17 */
18 - STOP(1,"停止"); 18 + STOP(1, "停止");
19 19
20 20
21 private Integer code; 21 private Integer code;
cloud/common/src/main/java/com/sincere/common/enums/OperationStatusEnum.java
  Diff comments   View file @e92e5a9
@@ -8,7 +8,7 @@ package com.sincere.common.enums; @@ -8,7 +8,7 @@ package com.sincere.common.enums;
8 public enum OperationStatusEnum { 8 public enum OperationStatusEnum {
9 9
10 SUCCESS("0", "成功"), 10 SUCCESS("0", "成功"),
11 - FAIL("1","失败"); 11 + FAIL("1", "失败");
12 12
13 13
14 private String code; 14 private String code;
cloud/common/src/main/java/com/sincere/common/enums/PasswordEncoderEnum.java
  Diff comments   View file @e92e5a9
@@ -17,7 +17,7 @@ public enum PasswordEncoderEnum { @@ -17,7 +17,7 @@ public enum PasswordEncoderEnum {
17 17
18 private String value; 18 private String value;
19 19
20 - private PasswordEncoderEnum(String value){ 20 + private PasswordEncoderEnum(String value) {
21 this.value = value; 21 this.value = value;
22 } 22 }
23 23
cloud/common/src/main/java/com/sincere/common/enums/PushTypeEnums.java
  Diff comments   View file @e92e5a9
@@ -5,17 +5,17 @@ package com.sincere.common.enums; @@ -5,17 +5,17 @@ package com.sincere.common.enums;
5 * @version 1.0 5 * @version 1.0
6 * @date 2019/12/10 0010 11:30 6 * @date 2019/12/10 0010 11:30
7 */ 7 */
8 -public enum PushTypeEnums { 8 +public enum PushTypeEnums {
9 9
10 - WEB(0,"站内消息"),  
11 - APP(1,"APP消息"),  
12 - MESSAGE(2,"短消息"),  
13 - WECHAT(3,"微信公众号"),  
14 - DING(4,"盯盯消息"),  
15 - QIYEHAO(5,"企业号消息"); 10 + WEB(0, "站内消息"),
  11 + APP(1, "APP消息"),
  12 + MESSAGE(2, "短消息"),
  13 + WECHAT(3, "微信公众号"),
  14 + DING(4, "盯盯消息"),
  15 + QIYEHAO(5, "企业号消息");
16 16
17 - private int type ;  
18 - private String name ; 17 + private int type;
  18 + private String name;
19 19
20 PushTypeEnums(int type, String name) { 20 PushTypeEnums(int type, String name) {
21 this.type = type; 21 this.type = type;
cloud/common/src/main/java/com/sincere/common/enums/ResourceTypeEnum.java
  Diff comments   View file @e92e5a9
@@ -5,9 +5,9 @@ package com.sincere.common.enums; @@ -5,9 +5,9 @@ package com.sincere.common.enums;
5 * @date: 2018/10/17 16:03 5 * @date: 2018/10/17 16:03
6 * @description: 资源类型枚举 6 * @description: 资源类型枚举
7 */ 7 */
8 -public enum ResourceTypeEnum { 8 +public enum ResourceTypeEnum {
9 MENU("0", "菜单"), 9 MENU("0", "菜单"),
10 - BUTTON("1","按钮"); 10 + BUTTON("1", "按钮");
11 11
12 12
13 private String code; 13 private String code;
cloud/common/src/main/java/com/sincere/common/enums/ResponseCodeEnum.java
  Diff comments   View file @e92e5a9
@@ -5,15 +5,15 @@ package com.sincere.common.enums; @@ -5,15 +5,15 @@ package com.sincere.common.enums;
5 * @date: 2018/10/12 10:51 5 * @date: 2018/10/12 10:51
6 * @description: 响应信息code枚举 6 * @description: 响应信息code枚举
7 */ 7 */
8 -public enum ResponseCodeEnum { 8 +public enum ResponseCodeEnum {
9 9
10 SUCCESS(0, "success"), 10 SUCCESS(0, "success"),
11 11
12 - NOT_LOGIN(-1,"need login"), 12 + NOT_LOGIN(-1, "need login"),
13 13
14 - FAIL(-1,"fail"), 14 + FAIL(-1, "fail"),
15 15
16 - PERMISSION_DEFINED(2,"permission defined"); 16 + PERMISSION_DEFINED(2, "permission defined");
17 17
18 18
19 private Integer code; 19 private Integer code;
cloud/common/src/main/java/com/sincere/common/enums/SmsMessageChannnelEnum.java
  Diff comments   View file @e92e5a9
@@ -7,7 +7,7 @@ import lombok.Getter; @@ -7,7 +7,7 @@ import lombok.Getter;
7 * @date: 2018/12/3 10:44 7 * @date: 2018/12/3 10:44
8 */ 8 */
9 9
10 -public enum SmsMessageChannnelEnum { 10 +public enum SmsMessageChannnelEnum {
11 11
12 /** 12 /**
13 * 腾讯云 13 * 腾讯云
cloud/common/src/main/java/com/sincere/common/enums/SmsTemplateEnum.java
  Diff comments   View file @e92e5a9
@@ -6,7 +6,7 @@ import lombok.Getter; @@ -6,7 +6,7 @@ import lombok.Getter;
6 * @author: yukong 6 * @author: yukong
7 * @date: 2018/12/14 14:53 7 * @date: 2018/12/14 14:53
8 */ 8 */
9 -public enum SmsTemplateEnum { 9 +public enum SmsTemplateEnum {
10 10
11 /** 11 /**
12 * 腾讯云 12 * 腾讯云
cloud/common/src/main/java/com/sincere/common/enums/SysLogTypeEnum.java
  Diff comments   View file @e92e5a9
@@ -7,7 +7,7 @@ package com.sincere.common.enums; @@ -7,7 +7,7 @@ package com.sincere.common.enums;
7 */ 7 */
8 public enum SysLogTypeEnum { 8 public enum SysLogTypeEnum {
9 LOGIN("0", "登录日志"), 9 LOGIN("0", "登录日志"),
10 - OPERATOR("1","操作日志"); 10 + OPERATOR("1", "操作日志");
11 11
12 12
13 private String code; 13 private String code;
cloud/common/src/main/java/com/sincere/common/enums/UserStatusEnum.java
  Diff comments   View file @e92e5a9
@@ -5,7 +5,7 @@ package com.sincere.common.enums; @@ -5,7 +5,7 @@ package com.sincere.common.enums;
5 * @date: 2018/10/9 14:35 5 * @date: 2018/10/9 14:35
6 * @description: 用户状态枚举 6 * @description: 用户状态枚举
7 */ 7 */
8 -public enum UserStatusEnum { 8 +public enum UserStatusEnum {
9 9
10 /** 10 /**
11 * 正常 11 * 正常
@@ -15,7 +15,7 @@ public enum UserStatusEnum { @@ -15,7 +15,7 @@ public enum UserStatusEnum {
15 /** 15 /**
16 * 锁定 16 * 锁定
17 */ 17 */
18 - LOCK("1","锁定"); 18 + LOCK("1", "锁定");
19 19
20 20
21 private String code; 21 private String code;
cloud/common/src/main/java/com/sincere/common/exception/ResultEnums.java
  Diff comments   View file @e92e5a9
1 package com.sincere.common.exception; 1 package com.sincere.common.exception;
2 2
3 public enum ResultEnums { 3 public enum ResultEnums {
4 - success(0,"成功"),  
5 - not_avail(-1,"token无效"),  
6 - expire(-2,"token过期"),  
7 - account_null(-3,"账号为空"),  
8 - error(-4,"系统繁忙"),  
9 - no_token(-5,"没有传token"); 4 + success(0, "成功"),
  5 + not_avail(-1, "token无效"),
  6 + expire(-2, "token过期"),
  7 + account_null(-3, "账号为空"),
  8 + error(-4, "系统繁忙"),
  9 + no_token(-5, "没有传token");
10 10
11 - private int code ;  
12 - private String message ; 11 + private int code;
  12 + private String message;
13 13
14 ResultEnums(int code, String message) { 14 ResultEnums(int code, String message) {
15 this.code = code; 15 this.code = code;
@@ -32,12 +32,12 @@ public enum ResultEnums { @@ -32,12 +32,12 @@ public enum ResultEnums {
32 this.message = message; 32 this.message = message;
33 } 33 }
34 34
35 - public static ResultEnums getByCode(int code){  
36 - for(ResultEnums enums :ResultEnums.values()){  
37 - if(enums.getCode() == code){  
38 - return enums ; 35 + public static ResultEnums getByCode(int code) {
  36 + for (ResultEnums enums : ResultEnums.values()) {
  37 + if (enums.getCode() == code) {
  38 + return enums;
39 } 39 }
40 } 40 }
41 - return ResultEnums.error ; 41 + return ResultEnums.error;
42 } 42 }
43 } 43 }
cloud/common/src/main/java/com/sincere/common/exception/ResultException.java
  Diff comments   View file @e92e5a9
@@ -2,8 +2,8 @@ package com.sincere.common.exception; @@ -2,8 +2,8 @@ package com.sincere.common.exception;
2 2
3 public class ResultException extends Exception { 3 public class ResultException extends Exception {
4 4
5 - private int code ;  
6 - private String message ; 5 + private int code;
  6 + private String message;
7 7
8 public int getCode() { 8 public int getCode() {
9 return code; 9 return code;
cloud/common/src/main/java/com/sincere/common/util/ApiResult.java
  Diff comments   View file @e92e5a9
@@ -42,7 +42,7 @@ public class ApiResult&lt;T&gt; implements Serializable { @@ -42,7 +42,7 @@ public class ApiResult&lt;T&gt; implements Serializable {
42 this.code = ResponseCodeEnum.FAIL.getCode(); 42 this.code = ResponseCodeEnum.FAIL.getCode();
43 } 43 }
44 44
45 - public ApiResult(Throwable throwable, ResponseCodeEnum code) { 45 + public ApiResult(Throwable throwable, ResponseCodeEnum code) {
46 this.message = throwable.getMessage(); 46 this.message = throwable.getMessage();
47 this.code = code.getCode(); 47 this.code = code.getCode();
48 } 48 }
cloud/common/src/main/java/com/sincere/common/util/AuthService.java
  Diff comments   View file @e92e5a9
@@ -15,8 +15,10 @@ public class AuthService { @@ -15,8 +15,10 @@ public class AuthService {
15 public static final String APP_ID = "15990462"; 15 public static final String APP_ID = "15990462";
16 public static final String API_KEY = "t70Rzr6SGmfU9S6MrqAkspsY"; 16 public static final String API_KEY = "t70Rzr6SGmfU9S6MrqAkspsY";
17 public static final String SECRET_KEY = "nSqpqtrf7cCjo8vOB9knL85nwWNoxwvS "; 17 public static final String SECRET_KEY = "nSqpqtrf7cCjo8vOB9knL85nwWNoxwvS ";
  18 +
18 /** 19 /**
19 * 获取权限token 20 * 获取权限token
  21 + *
20 * @return 返回示例： 22 * @return 返回示例：
21 * { 23 * {
22 * "access_token": "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567", 24 * "access_token": "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567",
@@ -43,6 +45,7 @@ public class AuthService { @@ -43,6 +45,7 @@ public class AuthService {
43 /** 45 /**
44 * 获取API访问token 46 * 获取API访问token
45 * 该token有一定的有效期，需要自行管理，当失效时需重新获取. 47 * 该token有一定的有效期，需要自行管理，当失效时需重新获取.
  48 + *
46 * @param ak - 百度云官网获取的 API Key 49 * @param ak - 百度云官网获取的 API Key
47 * @param sk - 百度云官网获取的 Securet Key 50 * @param sk - 百度云官网获取的 Securet Key
48 * @return assess_token 示例： 51 * @return assess_token 示例：
cloud/common/src/main/java/com/sincere/common/util/DateUtils.java
  Diff comments   View file @e92e5a9
@@ -18,21 +18,21 @@ public class DateUtils { @@ -18,21 +18,21 @@ public class DateUtils {
18 18
19 public static String format2 = "yyyy-MM-dd HH:mm:ss"; 19 public static String format2 = "yyyy-MM-dd HH:mm:ss";
20 20
21 - public static String format3 = "yyyyMMddHHmm" ; 21 + public static String format3 = "yyyyMMddHHmm";
22 22
23 - public static String format4 = "HH:mm" ; 23 + public static String format4 = "HH:mm";
24 24
25 - public static String format5 = "yyyyMMdd" ; 25 + public static String format5 = "yyyyMMdd";
26 26
27 - public static long getDate(){ 27 + public static long getDate() {
28 return System.currentTimeMillis(); 28 return System.currentTimeMillis();
29 } 29 }
30 30
31 - public static Date getByLong(String lo){ 31 + public static Date getByLong(String lo) {
32 long time = Long.parseLong(lo); 32 long time = Long.parseLong(lo);
33 Date date = new Date(time); 33 Date date = new Date(time);
34 SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 34 SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
35 - return string2Date(sd.format(date),format2); 35 + return string2Date(sd.format(date), format2);
36 } 36 }
37 37
38 public static String date2String(Date date, String format) { 38 public static String date2String(Date date, String format) {
@@ -41,20 +41,20 @@ public class DateUtils { @@ -41,20 +41,20 @@ public class DateUtils {
41 } 41 }
42 42
43 public static Date string2Date(String date, String format) { 43 public static Date string2Date(String date, String format) {
44 - try{ 44 + try {
45 SimpleDateFormat sdf = new SimpleDateFormat(format); 45 SimpleDateFormat sdf = new SimpleDateFormat(format);
46 return sdf.parse(date); 46 return sdf.parse(date);
47 - }catch (Exception e){ 47 + } catch (Exception e) {
48 48
49 } 49 }
50 return new Date(); 50 return new Date();
51 } 51 }
52 52
53 - public static Date getToday(){ 53 + public static Date getToday() {
54 return new Date(); 54 return new Date();
55 } 55 }
56 56
57 - public static String getToday(String format) throws ParseException{ 57 + public static String getToday(String format) throws ParseException {
58 SimpleDateFormat sdf = new SimpleDateFormat(format); 58 SimpleDateFormat sdf = new SimpleDateFormat(format);
59 return sdf.format(new Date()); 59 return sdf.format(new Date());
60 } 60 }
@@ -78,38 +78,38 @@ public class DateUtils { @@ -78,38 +78,38 @@ public class DateUtils {
78 return difference; 78 return difference;
79 } 79 }
80 80
81 - public static int getWeek(){ 81 + public static int getWeek() {
82 Date today = new Date(); 82 Date today = new Date();
83 Calendar c = Calendar.getInstance(); 83 Calendar c = Calendar.getInstance();
84 c.setTime(today); 84 c.setTime(today);
85 int weekday = c.get(Calendar.DAY_OF_WEEK); 85 int weekday = c.get(Calendar.DAY_OF_WEEK);
86 - return weekday-1 ; 86 + return weekday - 1;
87 } 87 }
88 88
89 - public static String getWeekName(){ 89 + public static String getWeekName() {
90 Date today = new Date(); 90 Date today = new Date();
91 Calendar c = Calendar.getInstance(); 91 Calendar c = Calendar.getInstance();
92 c.setTime(today); 92 c.setTime(today);
93 int weekday = c.get(Calendar.DAY_OF_WEEK); 93 int weekday = c.get(Calendar.DAY_OF_WEEK);
94 - if(weekday == 1){ 94 + if (weekday == 1) {
95 return "周日"; 95 return "周日";
96 } 96 }
97 - if(weekday == 2){ 97 + if (weekday == 2) {
98 return "周一"; 98 return "周一";
99 } 99 }
100 - if(weekday == 3){ 100 + if (weekday == 3) {
101 return "周二"; 101 return "周二";
102 } 102 }
103 - if(weekday == 4){ 103 + if (weekday == 4) {
104 return "周三"; 104 return "周三";
105 } 105 }
106 - if(weekday == 5){ 106 + if (weekday == 5) {
107 return "周四"; 107 return "周四";
108 } 108 }
109 - if(weekday == 6){ 109 + if (weekday == 6) {
110 return "周五"; 110 return "周五";
111 } 111 }
112 - if(weekday == 7){ 112 + if (weekday == 7) {
113 return "周六"; 113 return "周六";
114 } 114 }
115 return ""; 115 return "";
cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java
  Diff comments   View file @e92e5a9
@@ -31,6 +31,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.getMessage; @@ -31,6 +31,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.getMessage;
31 31
32 /** 32 /**
33 * HttpClient4.3工具类 33 * HttpClient4.3工具类
  34 + *
34 * @author chen 35 * @author chen
35 * @version 1.0 36 * @version 1.0
36 * @date 2019/10/11 0011 10:17 37 * @date 2019/10/11 0011 10:17
@@ -50,13 +51,13 @@ public class HttpClientUtils { @@ -50,13 +51,13 @@ public class HttpClientUtils {
50 // JSONObject jsonObject = HttpClientUtils.httpPostJson(url,json); 51 // JSONObject jsonObject = HttpClientUtils.httpPostJson(url,json);
51 // System.out.println(jsonObject.toJSONString()); 52 // System.out.println(jsonObject.toJSONString());
52 53
53 - String url = "http://39.100.248.170:8080/recv" ; 54 + String url = "http://39.100.248.170:8080/recv";
54 String json = "{\n" + 55 String json = "{\n" +
55 " \"appKey\":\"c9kqb3rdc2j9j\",\n" + 56 " \"appKey\":\"c9kqb3rdc2j9j\",\n" +
56 " \"channelId\":\"12\",\n" + 57 " \"channelId\":\"12\",\n" +
57 " \"event\":2,\n" + 58 " \"event\":2,\n" +
58 " \"userId\":\"hHjap87\",\n" + 59 " \"userId\":\"hHjap87\",\n" +
59 - " \"timestamp\":"+System.currentTimeMillis()+",\n" + 60 + " \"timestamp\":" + System.currentTimeMillis() + ",\n" +
60 " \"token\":\"y6f/aqQ2uJy9cgB4iKxxBNAX/fjWZa8YqXq8ZvODQXbnQpU4ylueQGbBvhBzsKU5camPO4XrURpN73+6paUtbPDbI+qinUYn\",\n" + 61 " \"token\":\"y6f/aqQ2uJy9cgB4iKxxBNAX/fjWZa8YqXq8ZvODQXbnQpU4ylueQGbBvhBzsKU5camPO4XrURpN73+6paUtbPDbI+qinUYn\",\n" +
61 " \"extra\":\"xxxx\",\n" + 62 " \"extra\":\"xxxx\",\n" +
62 " \"members\":\n" + 63 " \"members\":\n" +
@@ -66,8 +67,8 @@ public class HttpClientUtils { @@ -66,8 +67,8 @@ public class HttpClientUtils {
66 " \"key1\":\"value1\"\n" + 67 " \"key1\":\"value1\"\n" +
67 " }\n" + 68 " }\n" +
68 " }\n" + 69 " }\n" +
69 - "}" ;  
70 - JSONObject jsonObject = HttpClientUtils.httpPostJson(url,json); 70 + "}";
  71 + JSONObject jsonObject = HttpClientUtils.httpPostJson(url, json);
71 System.out.println(jsonObject.toJSONString()); 72 System.out.println(jsonObject.toJSONString());
72 // String appKey = "c9kqb3rdc2j9j"; 73 // String appKey = "c9kqb3rdc2j9j";
73 // String appSecret = "L2ven2G1fB5"; 74 // String appSecret = "L2ven2G1fB5";
@@ -90,7 +91,8 @@ public class HttpClientUtils { @@ -90,7 +91,8 @@ public class HttpClientUtils {
90 91
91 /** 92 /**
92 * post请求传输json参数 93 * post请求传输json参数
93 - * @param url url地址 94 + *
  95 + * @param url url地址
94 * @param jsonParam 参数 96 * @param jsonParam 参数
95 * @return 97 * @return
96 */ 98 */
@@ -130,8 +132,9 @@ public class HttpClientUtils { @@ -130,8 +132,9 @@ public class HttpClientUtils {
130 /** 132 /**
131 * post请求传输String参数 例如：name=Jack&sex=1&type=2 133 * post请求传输String参数 例如：name=Jack&sex=1&type=2
132 * Content-type:application/x-www-form-urlencoded 134 * Content-type:application/x-www-form-urlencoded
133 - * @param url url地址  
134 - * @param strParam 参数 135 + *
  136 + * @param url url地址
  137 + * @param strParam 参数
135 * @return 138 * @return
136 */ 139 */
137 public static JSONObject httpPost(String url, String strParam) { 140 public static JSONObject httpPost(String url, String strParam) {
@@ -167,6 +170,7 @@ public class HttpClientUtils { @@ -167,6 +170,7 @@ public class HttpClientUtils {
167 170
168 /** 171 /**
169 * 发送get请求 172 * 发送get请求
  173 + *
170 * @param url 路径 174 * @param url 路径
171 * @return 175 * @return
172 */ 176 */
@@ -198,7 +202,7 @@ public class HttpClientUtils { @@ -198,7 +202,7 @@ public class HttpClientUtils {
198 public static String httpGet2(String url) { 202 public static String httpGet2(String url) {
199 // get请求返回结果 203 // get请求返回结果
200 JSONObject jsonResult = null; 204 JSONObject jsonResult = null;
201 - String result = "" ; 205 + String result = "";
202 CloseableHttpClient client = HttpClients.createDefault(); 206 CloseableHttpClient client = HttpClients.createDefault();
203 // 发送get请求 207 // 发送get请求
204 HttpGet request = new HttpGet(url); 208 HttpGet request = new HttpGet(url);
@@ -223,31 +227,30 @@ public class HttpClientUtils { @@ -223,31 +227,30 @@ public class HttpClientUtils {
223 } 227 }
224 228
225 229
226 - public static InputStream GetFileInputStream(String fileUrl){  
227 - try{ 230 + public static InputStream GetFileInputStream(String fileUrl) {
  231 + try {
228 URL url = new URL(fileUrl); 232 URL url = new URL(fileUrl);
229 - HttpURLConnection conn = (HttpURLConnection)url.openConnection(); 233 + HttpURLConnection conn = (HttpURLConnection) url.openConnection();
230 //设置超时间为3秒 234 //设置超时间为3秒
231 - conn.setConnectTimeout(8*1000); 235 + conn.setConnectTimeout(8 * 1000);
232 //得到输入流 236 //得到输入流
233 InputStream inputStream = conn.getInputStream(); 237 InputStream inputStream = conn.getInputStream();
234 238
235 - return inputStream ;  
236 - }catch (Exception e){ 239 + return inputStream;
  240 + } catch (Exception e) {
237 241
238 } 242 }
239 - return null ; 243 + return null;
240 } 244 }
241 245
242 /** 246 /**
243 - *  
244 * @param wsdl 247 * @param wsdl
245 * @param ns 248 * @param ns
246 * @param method 249 * @param method
247 - * @param list 参数 250 + * @param list 参数
248 * @return 251 * @return
249 */ 252 */
250 - public synchronized static String invoiceWebService(String wsdl, String ns, String method, List<String> list){ 253 + public synchronized static String invoiceWebService(String wsdl, String ns, String method, List<String> list) {
251 StringBuffer stringBuffer = new StringBuffer(); 254 StringBuffer stringBuffer = new StringBuffer();
252 //拼接参数 255 //拼接参数
253 for (int i = 0; i < list.size(); i++) { 256 for (int i = 0; i < list.size(); i++) {
@@ -274,16 +277,16 @@ public class HttpClientUtils { @@ -274,16 +277,16 @@ public class HttpClientUtils {
274 HttpClient httpClient = new HttpClient(); 277 HttpClient httpClient = new HttpClient();
275 int status = httpClient.executeMethod(postMethod); 278 int status = httpClient.executeMethod(postMethod);
276 if (status == 200) { 279 if (status == 200) {
277 - return postMethod.getResponseBodyAsString() ; 280 + return postMethod.getResponseBodyAsString();
278 } 281 }
279 } catch (Exception e) { 282 } catch (Exception e) {
280 e.printStackTrace(); 283 e.printStackTrace();
281 } finally { 284 } finally {
282 - try{ 285 + try {
283 if (is != null) { 286 if (is != null) {
284 is.close(); 287 is.close();
285 } 288 }
286 - }catch (Exception e){ 289 + } catch (Exception e) {
287 290
288 } 291 }
289 } 292 }
cloud/common/src/main/java/com/sincere/common/util/RedisUtils.java
  Diff comments   View file @e92e5a9
@@ -28,9 +28,9 @@ public class RedisUtils { @@ -28,9 +28,9 @@ public class RedisUtils {
28 28
29 @PostConstruct 29 @PostConstruct
30 public void getApiToken() { 30 public void getApiToken() {
31 - ADDR = this.host ;  
32 - PORT = this.port ;  
33 - AUTH = this.password ; 31 + ADDR = this.host;
  32 + PORT = this.port;
  33 + AUTH = this.password;
34 } 34 }
35 35
36 //Redis服务器IP 36 //Redis服务器IP
@@ -62,6 +62,7 @@ public class RedisUtils { @@ -62,6 +62,7 @@ public class RedisUtils {
62 62
63 /** 63 /**
64 * 获取Jedis实例 64 * 获取Jedis实例
  65 + *
65 * @return 66 * @return
66 */ 67 */
67 public synchronized static Jedis getJedis() { 68 public synchronized static Jedis getJedis() {
@@ -88,6 +89,7 @@ public class RedisUtils { @@ -88,6 +89,7 @@ public class RedisUtils {
88 89
89 /** 90 /**
90 * 释放jedis资源 91 * 释放jedis资源
  92 + *
91 * @param jedis 93 * @param jedis
92 */ 94 */
93 public static void returnResource(final Jedis jedis) { 95 public static void returnResource(final Jedis jedis) {
@@ -96,22 +98,21 @@ public class RedisUtils { @@ -96,22 +98,21 @@ public class RedisUtils {
96 } 98 }
97 } 99 }
98 100
99 - public static void setString(String key ,String value){ 101 + public static void setString(String key, String value) {
100 Jedis jedis = null; 102 Jedis jedis = null;
101 try { 103 try {
102 jedis = getJedis(); 104 jedis = getJedis();
103 - jedis.set(key,value); 105 + jedis.set(key, value);
104 } catch (Exception e) { 106 } catch (Exception e) {
105 System.out.println("setString设置redis键值异常:key=" + key + " value=" + value + " cause:" + e.getMessage()); 107 System.out.println("setString设置redis键值异常:key=" + key + " value=" + value + " cause:" + e.getMessage());
106 } finally { 108 } finally {
107 - if(jedis != null)  
108 - { 109 + if (jedis != null) {
109 jedis.close(); 110 jedis.close();
110 } 111 }
111 } 112 }
112 } 113 }
113 114
114 - public static void setObject(String key,Object object) { 115 + public static void setObject(String key, Object object) {
115 Jedis jedis = null; 116 Jedis jedis = null;
116 try { 117 try {
117 jedis = getJedis(); 118 jedis = getJedis();
@@ -120,27 +121,25 @@ public class RedisUtils { @@ -120,27 +121,25 @@ public class RedisUtils {
120 e.printStackTrace(); 121 e.printStackTrace();
121 System.out.println("setString设置redis键值异常:key=" + key + " value=" + object + " cause:" + e.getMessage()); 122 System.out.println("setString设置redis键值异常:key=" + key + " value=" + object + " cause:" + e.getMessage());
122 } finally { 123 } finally {
123 - if(jedis != null)  
124 - { 124 + if (jedis != null) {
125 jedis.close(); 125 jedis.close();
126 } 126 }
127 } 127 }
128 } 128 }
129 129
130 - public static void setString(String key ,String value , int expireTime){ 130 + public static void setString(String key, String value, int expireTime) {
131 String result = "OK"; 131 String result = "OK";
132 Jedis jedis = null; 132 Jedis jedis = null;
133 try { 133 try {
134 jedis = getJedis(); 134 jedis = getJedis();
135 - jedis.set(key,value);  
136 - if(result.equals("OK")) { 135 + jedis.set(key, value);
  136 + if (result.equals("OK")) {
137 jedis.expire(key.getBytes(), expireTime); 137 jedis.expire(key.getBytes(), expireTime);
138 } 138 }
139 } catch (Exception e) { 139 } catch (Exception e) {
140 System.out.println("setString设置redis键值异常:key=" + key + " value=" + value + " cause:" + e.getMessage()); 140 System.out.println("setString设置redis键值异常:key=" + key + " value=" + value + " cause:" + e.getMessage());
141 } finally { 141 } finally {
142 - if(jedis != null)  
143 - { 142 + if (jedis != null) {
144 jedis.close(); 143 jedis.close();
145 } 144 }
146 } 145 }
@@ -165,7 +164,7 @@ public class RedisUtils { @@ -165,7 +164,7 @@ public class RedisUtils {
165 try { 164 try {
166 jedis = getJedis(); 165 jedis = getJedis();
167 byte[] value = jedis.get(key.getBytes()); 166 byte[] value = jedis.get(key.getBytes());
168 - return SerializeUtil. unserialize(value); 167 + return SerializeUtil.unserialize(value);
169 } catch (Exception e) { 168 } catch (Exception e) {
170 System.out.println("getString获取redis键值异常:key=" + key + " cause:" + e.getMessage()); 169 System.out.println("getString获取redis键值异常:key=" + key + " cause:" + e.getMessage());
171 } finally { 170 } finally {
@@ -183,12 +182,11 @@ public class RedisUtils { @@ -183,12 +182,11 @@ public class RedisUtils {
183 try { 182 try {
184 jedis = getJedis(); 183 jedis = getJedis();
185 return jedis.del(key.getBytes()); 184 return jedis.del(key.getBytes());
186 - }catch(Exception e) { 185 + } catch (Exception e) {
187 e.printStackTrace(); 186 e.printStackTrace();
188 return null; 187 return null;
189 - }finally{  
190 - if(jedis != null)  
191 - { 188 + } finally {
  189 + if (jedis != null) {
192 jedis.close(); 190 jedis.close();
193 } 191 }
194 } 192 }
@@ -199,12 +197,11 @@ public class RedisUtils { @@ -199,12 +197,11 @@ public class RedisUtils {
199 try { 197 try {
200 jedis = getJedis(); 198 jedis = getJedis();
201 return jedis.exists(key); 199 return jedis.exists(key);
202 - }catch(Exception e) { 200 + } catch (Exception e) {
203 e.printStackTrace(); 201 e.printStackTrace();
204 return false; 202 return false;
205 - }finally{  
206 - if(jedis != null)  
207 - { 203 + } finally {
  204 + if (jedis != null) {
208 jedis.close(); 205 jedis.close();
209 } 206 }
210 } 207 }
cloud/common/src/main/java/com/sincere/common/util/SerializeUtil.java
  Diff comments   View file @e92e5a9
@@ -30,7 +30,7 @@ public class SerializeUtil { @@ -30,7 +30,7 @@ public class SerializeUtil {
30 } 30 }
31 31
32 // 反序列化 32 // 反序列化
33 - public static Object unserialize( byte[] bytes) { 33 + public static Object unserialize(byte[] bytes) {
34 ByteArrayInputStream bais = null; 34 ByteArrayInputStream bais = null;
35 try { 35 try {
36 bais = new ByteArrayInputStream(bytes); 36 bais = new ByteArrayInputStream(bytes);
cloud/common/src/main/java/com/sincere/common/util/SpringUtils.java
  Diff comments   View file @e92e5a9
@@ -8,30 +8,29 @@ import org.springframework.stereotype.Component; @@ -8,30 +8,29 @@ import org.springframework.stereotype.Component;
8 8
9 /** 9 /**
10 * spring获取bean工具类 10 * spring获取bean工具类
11 - *  
12 -* @author 作者 owen E-mail: 624191343@qq.com  
13 - * @version 创建时间：2018年3月20日 下午10:13:18 类说明  
14 * 11 *
  12 + * @author 作者 owen E-mail: 624191343@qq.com
  13 + * @version 创建时间：2018年3月20日 下午10:13:18 类说明
15 */ 14 */
16 @Component 15 @Component
17 public class SpringUtils implements ApplicationContextAware { 16 public class SpringUtils implements ApplicationContextAware {
18 17
19 - private static ApplicationContext applicationContext = null; 18 + private static ApplicationContext applicationContext = null;
20 19
21 - @Override  
22 - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {  
23 - SpringUtils.applicationContext = applicationContext;  
24 - } 20 + @Override
  21 + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
  22 + SpringUtils.applicationContext = applicationContext;
  23 + }
25 24
26 - public static <T> T getBean(Class<T> cla) {  
27 - return applicationContext.getBean(cla);  
28 - } 25 + public static <T> T getBean(Class<T> cla) {
  26 + return applicationContext.getBean(cla);
  27 + }
29 28
30 - public static <T> T getBean(String name, Class<T> cal) {  
31 - return applicationContext.getBean(name, cal);  
32 - } 29 + public static <T> T getBean(String name, Class<T> cal) {
  30 + return applicationContext.getBean(name, cal);
  31 + }
33 32
34 - public static String getProperty(String key) {  
35 - return applicationContext.getBean(Environment.class).getProperty(key);  
36 - } 33 + public static String getProperty(String key) {
  34 + return applicationContext.getBean(Environment.class).getProperty(key);
  35 + }
37 } 36 }
cloud/common/src/main/java/com/sincere/common/util/TokenUtils.java
  Diff comments   View file @e92e5a9
@@ -25,6 +25,7 @@ public class TokenUtils { @@ -25,6 +25,7 @@ public class TokenUtils {
25 25
26 /** 26 /**
27 * 生成Token 27 * 生成Token
  28 + *
28 * @param account 29 * @param account
29 * @return 30 * @return
30 */ 31 */
@@ -39,7 +40,7 @@ public class TokenUtils { @@ -39,7 +40,7 @@ public class TokenUtils {
39 */ 40 */
40 JWTClaimsSet claimsSet = new JWTClaimsSet.Builder() 41 JWTClaimsSet claimsSet = new JWTClaimsSet.Builder()
41 .expirationTime(new Date(System.currentTimeMillis() + EXPIRE_TIME)) 42 .expirationTime(new Date(System.currentTimeMillis() + EXPIRE_TIME))
42 - .claim("ACCOUNT",account) 43 + .claim("ACCOUNT", account)
43 .build(); 44 .build();
44 45
45 /** 46 /**
@@ -63,6 +64,7 @@ public class TokenUtils { @@ -63,6 +64,7 @@ public class TokenUtils {
63 64
64 /** 65 /**
65 * 校验token 66 * 校验token
  67 + *
66 * @param token 68 * @param token
67 * @return 69 * @return
68 */ 70 */
@@ -84,7 +86,7 @@ public class TokenUtils { @@ -84,7 +86,7 @@ public class TokenUtils {
84 //获取载体中的数据 86 //获取载体中的数据
85 Object account = jwt.getJWTClaimsSet().getClaim("ACCOUNT"); 87 Object account = jwt.getJWTClaimsSet().getClaim("ACCOUNT");
86 //是否有openUid 88 //是否有openUid
87 - if (Objects.isNull(account)){ 89 + if (Objects.isNull(account)) {
88 throw new ResultException(-3, "账号为空"); 90 throw new ResultException(-3, "账号为空");
89 } 91 }
90 return account.toString(); 92 return account.toString();
cloud/common/src/main/java/com/sincere/common/util/Xml2JsonUtils.java
  Diff comments   View file @e92e5a9
@@ -15,74 +15,76 @@ public class Xml2JsonUtils { @@ -15,74 +15,76 @@ public class Xml2JsonUtils {
15 15
16 /** 16 /**
17 * xml转json 17 * xml转json
  18 + *
18 * @param xmlStr 19 * @param xmlStr
19 * @return 20 * @return
20 * @throws DocumentException 21 * @throws DocumentException
21 */ 22 */
22 - public static JSONObject xml2Json(String xmlStr){  
23 - try{  
24 - Document doc= DocumentHelper.parseText(xmlStr);  
25 - JSONObject json=new JSONObject(); 23 + public static JSONObject xml2Json(String xmlStr) {
  24 + try {
  25 + Document doc = DocumentHelper.parseText(xmlStr);
  26 + JSONObject json = new JSONObject();
26 dom4j2Json(doc.getRootElement(), json); 27 dom4j2Json(doc.getRootElement(), json);
27 return json; 28 return json;
28 - }catch (Exception e){ 29 + } catch (Exception e) {
29 30
30 } 31 }
31 - return null ; 32 + return null;
32 } 33 }
33 34
34 /** 35 /**
35 * xml转json 36 * xml转json
  37 + *
36 * @param element 38 * @param element
37 * @param json 39 * @param json
38 */ 40 */
39 - public static void dom4j2Json(Element element,JSONObject json){ 41 + public static void dom4j2Json(Element element, JSONObject json) {
40 //如果是属性 42 //如果是属性
41 - for(Object o:element.attributes()){  
42 - Attribute attr=(Attribute)o;  
43 - if(!isEmpty(attr.getValue())){  
44 - json.put("@"+attr.getName(), attr.getValue()); 43 + for (Object o : element.attributes()) {
  44 + Attribute attr = (Attribute) o;
  45 + if (!isEmpty(attr.getValue())) {
  46 + json.put("@" + attr.getName(), attr.getValue());
45 } 47 }
46 } 48 }
47 - List<Element> chdEl=element.elements();  
48 - if(chdEl.isEmpty()&&!isEmpty(element.getText())){//如果没有子元素,只有一个值 49 + List<Element> chdEl = element.elements();
  50 + if (chdEl.isEmpty() && !isEmpty(element.getText())) {//如果没有子元素,只有一个值
49 json.put(element.getName(), element.getText()); 51 json.put(element.getName(), element.getText());
50 } 52 }
51 53
52 - for(Element e:chdEl){//有子元素  
53 - if(!e.elements().isEmpty()){//子元素也有子元素  
54 - JSONObject chdjson=new JSONObject();  
55 - dom4j2Json(e,chdjson);  
56 - Object o=json.get(e.getName());  
57 - if(o!=null){  
58 - JSONArray jsona=null;  
59 - if(o instanceof JSONObject){//如果此元素已存在,则转为jsonArray  
60 - JSONObject jsono=(JSONObject)o; 54 + for (Element e : chdEl) {//有子元素
  55 + if (!e.elements().isEmpty()) {//子元素也有子元素
  56 + JSONObject chdjson = new JSONObject();
  57 + dom4j2Json(e, chdjson);
  58 + Object o = json.get(e.getName());
  59 + if (o != null) {
  60 + JSONArray jsona = null;
  61 + if (o instanceof JSONObject) {//如果此元素已存在,则转为jsonArray
  62 + JSONObject jsono = (JSONObject) o;
61 json.remove(e.getName()); 63 json.remove(e.getName());
62 - jsona=new JSONArray(); 64 + jsona = new JSONArray();
63 jsona.add(jsono); 65 jsona.add(jsono);
64 jsona.add(chdjson); 66 jsona.add(chdjson);
65 } 67 }
66 - if(o instanceof JSONArray){  
67 - jsona=(JSONArray)o; 68 + if (o instanceof JSONArray) {
  69 + jsona = (JSONArray) o;
68 jsona.add(chdjson); 70 jsona.add(chdjson);
69 } 71 }
70 json.put(e.getName(), jsona); 72 json.put(e.getName(), jsona);
71 - }else{  
72 - if(!chdjson.isEmpty()){ 73 + } else {
  74 + if (!chdjson.isEmpty()) {
73 json.put(e.getName(), chdjson); 75 json.put(e.getName(), chdjson);
74 } 76 }
75 } 77 }
76 78
77 79
78 - }else{//子元素没有子元素  
79 - for(Object o:element.attributes()){  
80 - Attribute attr=(Attribute)o;  
81 - if(!isEmpty(attr.getValue())){  
82 - json.put("@"+attr.getName(), attr.getValue()); 80 + } else {//子元素没有子元素
  81 + for (Object o : element.attributes()) {
  82 + Attribute attr = (Attribute) o;
  83 + if (!isEmpty(attr.getValue())) {
  84 + json.put("@" + attr.getName(), attr.getValue());
83 } 85 }
84 } 86 }
85 - if(!e.getText().isEmpty()){ 87 + if (!e.getText().isEmpty()) {
86 json.put(e.getName(), e.getText()); 88 json.put(e.getName(), e.getText());
87 } 89 }
88 } 90 }
cloud/common/src/main/java/com/sincere/common/vo/BaseVo.java
  Diff comments   View file @e92e5a9
@@ -5,7 +5,7 @@ import java.io.Serializable; @@ -5,7 +5,7 @@ import java.io.Serializable;
5 public class BaseVo implements Serializable { 5 public class BaseVo implements Serializable {
6 6
7 private boolean success; 7 private boolean success;
8 - private String message ; 8 + private String message;
9 9
10 public boolean isSuccess() { 10 public boolean isSuccess() {
11 return success; 11 return success;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseDetailVo.java
  Diff comments   View file @e92e5a9
@@ -9,17 +9,17 @@ import com.sincere.common.dto.independence.TeacherClassDto; @@ -9,17 +9,17 @@ import com.sincere.common.dto.independence.TeacherClassDto;
9 */ 9 */
10 public class ClassCourseDetailVo { 10 public class ClassCourseDetailVo {
11 11
12 - private String courseName ;  
13 - private String teacherName ;  
14 - private int times ;  
15 - private int joinTimes ; 12 + private String courseName;
  13 + private String teacherName;
  14 + private int times;
  15 + private int joinTimes;
16 16
17 17
18 public ClassCourseDetailVo(TeacherClassDto teacherClass) { 18 public ClassCourseDetailVo(TeacherClassDto teacherClass) {
19 this.courseName = teacherClass.getCourseName(); 19 this.courseName = teacherClass.getCourseName();
20 this.teacherName = teacherClass.getTeacherName(); 20 this.teacherName = teacherClass.getTeacherName();
21 this.joinTimes = teacherClass.getJoinTimes(); 21 this.joinTimes = teacherClass.getJoinTimes();
22 - this.times = teacherClass.getTimes()-2*(teacherClass.getJoinTimes()); 22 + this.times = teacherClass.getTimes() - 2 * (teacherClass.getJoinTimes());
23 } 23 }
24 24
25 25
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseVO.java
  Diff comments   View file @e92e5a9
@@ -9,11 +9,11 @@ import java.util.List; @@ -9,11 +9,11 @@ import java.util.List;
9 */ 9 */
10 public class ClassCourseVO { 10 public class ClassCourseVO {
11 11
12 - private int classId ;  
13 - private String className ;  
14 - private int allCount ; 12 + private int classId;
  13 + private String className;
  14 + private int allCount;
15 15
16 - List<ClassCourseDetailVo> list ; 16 + List<ClassCourseDetailVo> list;
17 17
18 public int getClassId() { 18 public int getClassId() {
19 return classId; 19 return classId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassRepVo.java
  Diff comments   View file @e92e5a9
@@ -12,7 +12,7 @@ import java.util.List; @@ -12,7 +12,7 @@ import java.util.List;
12 */ 12 */
13 public class ClassRepVo extends BaseVo { 13 public class ClassRepVo extends BaseVo {
14 14
15 - private List<ClassModelDto> data ; 15 + private List<ClassModelDto> data;
16 16
17 public List<ClassModelDto> getData() { 17 public List<ClassModelDto> getData() {
18 return data; 18 return data;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseClassReqVo.java
  Diff comments   View file @e92e5a9
@@ -7,8 +7,8 @@ package com.sincere.common.vo.independence.paike; @@ -7,8 +7,8 @@ package com.sincere.common.vo.independence.paike;
7 */ 7 */
8 public class CourseClassReqVo { 8 public class CourseClassReqVo {
9 9
10 - private int scheduleId ;  
11 - private int courseId ; 10 + private int scheduleId;
  11 + private int courseId;
12 12
13 public int getScheduleId() { 13 public int getScheduleId() {
14 return scheduleId; 14 return scheduleId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseGroupReqVo.java
  Diff comments   View file @e92e5a9
@@ -9,8 +9,8 @@ import java.io.Serializable; @@ -9,8 +9,8 @@ import java.io.Serializable;
9 */ 9 */
10 public class CourseGroupReqVo implements Serializable { 10 public class CourseGroupReqVo implements Serializable {
11 11
12 - private int scheduleId ;  
13 - private int courseGroup ; 12 + private int scheduleId;
  13 + private int courseGroup;
14 14
15 public int getScheduleId() { 15 public int getScheduleId() {
16 return scheduleId; 16 return scheduleId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseRepVo.java
  Diff comments   View file @e92e5a9
@@ -12,7 +12,7 @@ import java.util.List; @@ -12,7 +12,7 @@ import java.util.List;
12 */ 12 */
13 public class CourseRepVo extends BaseVo { 13 public class CourseRepVo extends BaseVo {
14 14
15 - private List<CourseDto> data ; 15 + private List<CourseDto> data;
16 16
17 public List<CourseDto> getData() { 17 public List<CourseDto> getData() {
18 return data; 18 return data;
@@ -22,7 +22,7 @@ public class CourseRepVo extends BaseVo { @@ -22,7 +22,7 @@ public class CourseRepVo extends BaseVo {
22 this.data = data; 22 this.data = data;
23 } 23 }
24 24
25 - public CourseRepVo(){ 25 + public CourseRepVo() {
26 super(); 26 super();
27 } 27 }
28 } 28 }
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseTypeListVO.java
  Diff comments   View file @e92e5a9
@@ -11,9 +11,9 @@ import java.util.List; @@ -11,9 +11,9 @@ import java.util.List;
11 */ 11 */
12 public class CourseTypeListVO { 12 public class CourseTypeListVO {
13 13
14 - private int courseType ;  
15 - private String courseTypeName ;  
16 - private List<CourseDto> list ; 14 + private int courseType;
  15 + private String courseTypeName;
  16 + private List<CourseDto> list;
17 17
18 public int getCourseType() { 18 public int getCourseType() {
19 return courseType; 19 return courseType;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/FirstReqVo.java
  Diff comments   View file @e92e5a9
@@ -5,9 +5,9 @@ import java.io.Serializable; @@ -5,9 +5,9 @@ import java.io.Serializable;
5 public class FirstReqVo implements Serializable { 5 public class FirstReqVo implements Serializable {
6 6
7 private int scheduleId; 7 private int scheduleId;
8 - private int morning ; 8 + private int morning;
9 private int afternoon; 9 private int afternoon;
10 - private int night ; 10 + private int night;
11 private int dayNumber; 11 private int dayNumber;
12 12
13 public int getScheduleId() { 13 public int getScheduleId() {
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetClassCourseReqVo.java
  Diff comments   View file @e92e5a9
@@ -7,8 +7,8 @@ package com.sincere.common.vo.independence.paike; @@ -7,8 +7,8 @@ package com.sincere.common.vo.independence.paike;
7 */ 7 */
8 public class GetClassCourseReqVo { 8 public class GetClassCourseReqVo {
9 9
10 - private int scheduleId ;  
11 - private int classId ; 10 + private int scheduleId;
  11 + private int classId;
12 12
13 public int getScheduleId() { 13 public int getScheduleId() {
14 return scheduleId; 14 return scheduleId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseClassListRepVo.java
  Diff comments   View file @e92e5a9
@@ -9,11 +9,11 @@ import java.io.Serializable; @@ -9,11 +9,11 @@ import java.io.Serializable;
9 */ 9 */
10 public class GetCourseClassListRepVo implements Serializable { 10 public class GetCourseClassListRepVo implements Serializable {
11 11
12 - private int classId ;  
13 - private String className ;  
14 - private int courseId ;  
15 - private String courseName ;  
16 - private String teacherName ; 12 + private int classId;
  13 + private String className;
  14 + private int courseId;
  15 + private String courseName;
  16 + private String teacherName;
17 17
18 public int getClassId() { 18 public int getClassId() {
19 return classId; 19 return classId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseTypeListRepVo.java
  Diff comments   View file @e92e5a9
@@ -11,8 +11,8 @@ import java.util.List; @@ -11,8 +11,8 @@ import java.util.List;
11 */ 11 */
12 public class GetCourseTypeListRepVo extends BaseVo { 12 public class GetCourseTypeListRepVo extends BaseVo {
13 13
14 - private int scheduleId ;  
15 - private List<CourseTypeListVO> data ; 14 + private int scheduleId;
  15 + private List<CourseTypeListVO> data;
16 16
17 public int getScheduleId() { 17 public int getScheduleId() {
18 return scheduleId; 18 return scheduleId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/InitRepVo.java
  Diff comments   View file @e92e5a9
@@ -10,9 +10,9 @@ import com.sincere.common.vo.BaseVo; @@ -10,9 +10,9 @@ import com.sincere.common.vo.BaseVo;
10 */ 10 */
11 public class InitRepVo extends BaseVo { 11 public class InitRepVo extends BaseVo {
12 12
13 - private int classNumber ;  
14 - private int teacherNumber ;  
15 - private int courseNumber ; 13 + private int classNumber;
  14 + private int teacherNumber;
  15 + private int courseNumber;
16 16
17 public int getClassNumber() { 17 public int getClassNumber() {
18 return classNumber; 18 return classNumber;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/InitTeacherCourseReqVo.java
  Diff comments   View file @e92e5a9
@@ -6,8 +6,8 @@ package com.sincere.common.vo.independence.paike; @@ -6,8 +6,8 @@ package com.sincere.common.vo.independence.paike;
6 * @date 2019/10/10 0010 9:04 6 * @date 2019/10/10 0010 9:04
7 */ 7 */
8 public class InitTeacherCourseReqVo { 8 public class InitTeacherCourseReqVo {
9 - private int scheduleId ;  
10 - private String url ; 9 + private int scheduleId;
  10 + private String url;
11 11
12 public int getScheduleId() { 12 public int getScheduleId() {
13 return scheduleId; 13 return scheduleId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinClassReqVo.java
  Diff comments   View file @e92e5a9
@@ -10,9 +10,9 @@ import java.util.List; @@ -10,9 +10,9 @@ import java.util.List;
10 */ 10 */
11 public class JoinClassReqVo implements Serializable { 11 public class JoinClassReqVo implements Serializable {
12 12
13 - private int scheduleId ;  
14 - private int courseId ;  
15 - private List<Integer> classIdList ; 13 + private int scheduleId;
  14 + private int courseId;
  15 + private List<Integer> classIdList;
16 16
17 public int getScheduleId() { 17 public int getScheduleId() {
18 return scheduleId; 18 return scheduleId;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinDetail.java
  Diff comments   View file @e92e5a9
@@ -7,10 +7,10 @@ package com.sincere.common.vo.independence.paike; @@ -7,10 +7,10 @@ package com.sincere.common.vo.independence.paike;
7 */ 7 */
8 public class JoinDetail { 8 public class JoinDetail {
9 9
10 - private int courseGroup ;  
11 - private String courseName ;  
12 - private String className ;  
13 - private String teacherName ; 10 + private int courseGroup;
  11 + private String courseName;
  12 + private String className;
  13 + private String teacherName;
14 14
15 public int getCourseGroup() { 15 public int getCourseGroup() {
16 return courseGroup; 16 return courseGroup;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinRepVo.java
  Diff comments   View file @e92e5a9
@@ -12,7 +12,7 @@ import java.util.List; @@ -12,7 +12,7 @@ import java.util.List;
12 */ 12 */
13 public class JoinRepVo extends BaseVo { 13 public class JoinRepVo extends BaseVo {
14 14
15 - private List<JoinDetail> data ; 15 + private List<JoinDetail> data;
16 16
17 public List<JoinDetail> getData() { 17 public List<JoinDetail> getData() {
18 return data; 18 return data;
cloud/common/src/main/java/com/sincere/common/vo/independence/paike/NoScheduleReqVo.java
  Diff comments   View file @e92e5a9
@@ -10,11 +10,11 @@ import java.util.List; @@ -10,11 +10,11 @@ import java.util.List;
10 */ 10 */
11 public class NoScheduleReqVo implements Serializable { 11 public class NoScheduleReqVo implements Serializable {
12 12
13 - private int scheduleId ;  
14 - private String grade ;  
15 - private int classId ;  
16 - private int level ; //1 班级不排 2 年级不排 3 学校不排  
17 - private List<String> list ; 13 + private int scheduleId;
  14 + private String grade;
  15 + private int classId;
  16 + private int level; //1 班级不排 2 年级不排 3 学校不排
  17 + private List<String> list;
18 18
19 public int getScheduleId() { 19 public int getScheduleId() {
20 return scheduleId; 20 return scheduleId;