fix

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/CourseController.java

@@ -8,7 +8,6 @@ import cn.rankin.apiweb.service.shopcart.ShopCartService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.data.api.app.vo.*;
 import cn.rankin.data.api.auth.vo.AuthResult;
-import cn.rankin.data.api.user.entity.Collection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

rankin-api-web/src/main/java/cn/rankin/apiweb/service/resource/ResourceService.java

@@ -1,6 +1,7 @@
 package cn.rankin.apiweb.service.resource;
 
 import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.constant.ResourceType;
 import cn.rankin.common.utils.vo.resource.ResourceVo;
 import cn.rankin.data.api.app.vo.CourseWareVo;
 import cn.rankin.data.api.app.vo.LessonVo;
@@ -68,7 +69,7 @@ public class ResourceService {
             }
 
             List<ResourceItemVo> resourceVoList = new ArrayList<>();
-            Integer type = 0;
+            Integer type = ResourceType.IMG;
             for (String resourceId : resourceIdList) {
                 ResourceVo resourceVo = resourceVoMap.get(resourceId);
                 if (resourceVo != null) {
@@ -77,8 +78,8 @@ public class ResourceService {
                     resourceItemVo.setUrl(resourceVo.getUrl());
                     Integer resourceType = resourceVo.getType();
                     resourceItemVo.setType(resourceType);
-                    if (resourceType != 0) {
-                        type = 1;
+                    if (resourceType.equals(ResourceType.VIDEO)) {
+                        type = ResourceType.VIDEO;
                     }
                     resourceVoList.add(resourceItemVo);
                 }

rankin-api-web/src/main/java/cn/rankin/apiweb/utils/DTOConverter.java

@@ -53,7 +53,7 @@ public class DTOConverter {
         for (CourseSubItemVo courseSubItemVo : subItemVoList) {
             LessonVo lessonVo = new LessonVo();
             lessonVo.setId(courseSubItemVo.getId());
-            lessonVo.setName(courseSubItemVo.getName());
+            lessonVo.setTitle(courseSubItemVo.getTitle());
             lessonVo.setCode(courseSubItemVo.getCode());
             lessonVoList.add(lessonVo);
         }
@@ -71,7 +71,7 @@ public class DTOConverter {
         LessonVo lessonVo = new LessonVo();
         lessonVo.setId(lesson.getId());
         lessonVo.setCode(lesson.getCode());
-        lessonVo.setName(lesson.getName());
+        lessonVo.setTitle(lesson.getTitle());
         return lessonVo;
     }
 
@@ -79,7 +79,7 @@ public class DTOConverter {
         CourseWareVo courseWareVo = new CourseWareVo();
         courseWareVo.setId(courseWare.getId());
         courseWareVo.setCode(courseWare.getCode());
-        courseWareVo.setTitle(courseWare.getName());
+        courseWareVo.setTitle(courseWare.getTitle());
         courseWareVo.setCategory(courseWare.getCategory());
         return courseWareVo;
     }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/WareController.java

@@ -4,7 +4,7 @@ import cn.rankin.cmsweb.service.product.proxy.WareServiceProxy;
 import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.product.dto.WareDTO;
+import cn.rankin.data.api.product.dto.CourseWareDTO;
 import cn.rankin.common.utils.dto.search.SearchDTO;
 import cn.rankin.data.api.product.vo.CourseWareVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,16 +25,16 @@ public class WareController {
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<CourseWareVo> create(@Valid @RequestBody WareDTO wareDTO) {
-        return wareService.create(wareDTO);
+    public APIResult<CourseWareVo> create(@Valid @RequestBody CourseWareDTO courseWareDTO) {
+        return wareService.create(courseWareDTO);
     }
 
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<CourseWareVo> update(@Valid @RequestBody WareDTO wareDTO) {
-        if (wareDTO.getId() == null) {
+    public APIResult<CourseWareVo> update(@Valid @RequestBody CourseWareDTO courseWareDTO) {
+        if (courseWareDTO.getId() == null) {
             return APIResult.error(APICode.error("参数错误: id"));
         }
-        return wareService.update(wareDTO);
+        return wareService.update(courseWareDTO);
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/WareService.java

@@ -2,7 +2,7 @@ package cn.rankin.cmsweb.service.product;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.product.dto.WareDTO;
+import cn.rankin.data.api.product.dto.CourseWareDTO;
 import cn.rankin.data.api.product.entity.CourseWare;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -16,10 +16,10 @@ public interface WareService {
     APIResult<Page<CourseWare>> search(@RequestParam Map<String, Object> searchDTO);
 
     @RequestMapping(value = "/ware", method = RequestMethod.POST)
-    APIResult<CourseWare> create(@RequestBody WareDTO wareDTO);
+    APIResult<CourseWare> create(@RequestBody CourseWareDTO courseWareDTO);
 
     @RequestMapping(value = "/ware", method = RequestMethod.PUT)
-    APIResult<CourseWare> update(@RequestBody WareDTO wareDTO);
+    APIResult<CourseWare> update(@RequestBody CourseWareDTO courseWareDTO);
 
     @RequestMapping(value = "/ware/{id}", method = RequestMethod.DELETE)
     APIResult delete(@PathVariable("id") String id);

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/proxy/WareServiceProxy.java

@@ -4,7 +4,7 @@ import cn.rankin.cmsweb.service.product.WareService;
 import cn.rankin.cmsweb.service.resource.ResourceService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.product.dto.WareDTO;
+import cn.rankin.data.api.product.dto.CourseWareDTO;
 import cn.rankin.common.utils.dto.search.SearchDTO;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.data.api.product.entity.CourseWare;
@@ -44,9 +44,9 @@ public class WareServiceProxy {
         return APIResult.ok(voPage);
     }
 
-    public APIResult<CourseWareVo> create(WareDTO wareDTO) {
+    public APIResult<CourseWareVo> create(CourseWareDTO courseWareDTO) {
         CourseWareVo courseWareVo = null;
-        APIResult<CourseWare> result = wareService.create(wareDTO);
+        APIResult<CourseWare> result = wareService.create(courseWareDTO);
         if (result.getSuccess()) {
             CourseWare courseWare = result.getData();
             courseWareVo = setWareUrl(courseWare);
@@ -54,9 +54,9 @@ public class WareServiceProxy {
         return APIResult.ok(courseWareVo);
     }
 
-    public APIResult<CourseWareVo> update(WareDTO wareDTO) {
+    public APIResult<CourseWareVo> update(CourseWareDTO courseWareDTO) {
         CourseWareVo courseWareVo = null;
-        APIResult<CourseWare> result = wareService.update(wareDTO);
+        APIResult<CourseWare> result = wareService.update(courseWareDTO);
         if (result.getSuccess()) {
             CourseWare courseWare = result.getData();
             courseWareVo = setWareUrl(courseWare);

rankin-common-utils/src/main/java/cn/rankin/common/utils/enums/ResourceType.java

@@ -1,4 +1,4 @@
-package cn.rankin.common.utils.enums;
+package cn.rankin.common.utils.constant;
 
 public class ResourceType {
 

rankin-common-utils/src/main/java/cn/rankin/common/utils/util/SecurityUtil.java

@@ -48,5 +48,7 @@ public class SecurityUtil {
         System.out.println(SecurityUtil.MD5("123456", null).equals("e10adc3949ba59abbe56e057f20f883e"));
         System.out.println(SecurityUtil.MD5("555"));
         System.out.println(SecurityUtil.MD5("666"));
+        System.out.println(SecurityUtil.MD5("001", "AFW_KEY_SALT"));
+        System.out.println(SecurityUtil.MD5(SecurityUtil.MD5("001")));
     }
 }

rankin-data-api/src/main/java/cn/rankin/data/api/app/vo/LessonVo.java

@@ -14,7 +14,7 @@ public class LessonVo implements Serializable {
 
     private String code;
 
-    private String name;
+    private String title;
 
     private List<CourseWareVo> list;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/dto/WareDTO.java

@@ -8,14 +8,14 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class WareDTO implements Serializable {
+public class CourseWareDTO implements Serializable {
 
     private String id;
 
     @NotNull
     private String code;
 
-    private String name;
+    private String title;
 
     private String category;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/dto/LessonDTO.java

@@ -15,7 +15,7 @@ public class LessonDTO implements Serializable {
     @NotNull
     private String code;
 
-    private String name;
+    private String title;
 
     private String digest;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/CourseWare.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "p_courseware", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
+@Table(name = "p_courseware", indexes = {@Index(columnList = "code"), @Index(columnList = "title")})
 @DynamicInsert
 @DynamicUpdate
 public class CourseWare implements Serializable{
@@ -27,7 +27,7 @@ public class CourseWare implements Serializable{
     private String code;
 
     @Column
-    private String name;
+    private String title;
 
     private String category;
 
@@ -42,9 +42,6 @@ public class CourseWare implements Serializable{
     private String cpId;
 
     @Column
-    private Integer sort;
-
-    @Column
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Lesson.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "p_lesson", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
+@Table(name = "p_lesson", indexes = {@Index(columnList = "code"), @Index(columnList = "title")})
 @DynamicInsert
 @DynamicUpdate
 public class Lesson implements Serializable {
@@ -26,12 +26,12 @@ public class Lesson implements Serializable {
     private String code;
 
     @Column
-    private String name;
+    private String title;
 
     @Column
     private String digest;
 
-    @Column
+    @Transient
     private Integer sort;
 
     @Column(nullable = false)

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/CourseSubItemVo.java

@@ -14,8 +14,6 @@ public class CourseSubItemVo implements Serializable{
 
     private String code;
 
-    private String name;
-
     private String title;
 
     private String digest;

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/CourseWareVo.java

@@ -16,7 +16,7 @@ public class CourseWareVo implements Serializable {
 
     private String code;
 
-    private String name;
+    private String title;
 
     private String category;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/LessonVo.java

@@ -14,7 +14,7 @@ public class LessonVo implements Serializable {
 
     private String code;
 
-    private String name;
+    private String title;
 
     private String digest;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/CmsUser.java

@@ -3,7 +3,6 @@ package cn.rankin.data.api.user.entity;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.enums.GenderEnum;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/OperationLog.java

@@ -25,15 +25,16 @@ public class OperationLog implements Serializable {
 
 	@Id
 	@Column(name = "id")
-	private Long id;
+	private String id;
+
 	@Column(name="user_id")
-	private Long userId;
+	private String userId;
 
 	@Column(name="user_name")
 	private String userName;
 
 	@Column(name="merchant_id")
-	private Long merchantId;
+	private String merchantId;
 
 	@Column(name="merchant_name")
 	private String merchantName;

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalDevice.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name="u_device", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "device_code"})})
+@Table(name="u_device_bind", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "device_code"})})
 @DynamicInsert
 @DynamicUpdate
 public class TerminalDevice implements Serializable {

rankin-product-service/src/main/java/cn/rankin/productservice/controller/cms/LessonController.java

@@ -50,7 +50,7 @@ public class LessonController {
 
         String name = searchDTO.getName();
         if (!StringUtils.isEmpty(name)) {
-            lesson.setName(name);
+            lesson.setTitle(name);
         }
 
         lesson.setStatus(searchDTO.getStatus());

rankin-product-service/src/main/java/cn/rankin/productservice/controller/cms/WareController.java

@@ -4,7 +4,7 @@ import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.dto.search.SearchDTO;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.product.dto.WareDTO;
+import cn.rankin.data.api.product.dto.CourseWareDTO;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.data.api.product.entity.Lesson;
 import cn.rankin.data.api.product.entity.LessonWareRelation;
@@ -46,7 +46,7 @@ public class WareController {
 
         String name = searchDTO.getName();
         if (!StringUtils.isEmpty(name)) {
-            CourseWare.setName("%" + name + "%");
+            CourseWare.setTitle("%" + name + "%");
         }
 
         CourseWare.setStatus(searchDTO.getStatus());
@@ -61,18 +61,18 @@ public class WareController {
 
     // 创建资源
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<CourseWare> create(@Valid @RequestBody WareDTO wareDTO) {
-        return wareService.create(wareDTO);
+    public APIResult<CourseWare> create(@Valid @RequestBody CourseWareDTO courseWareDTO) {
+        return wareService.create(courseWareDTO);
     }
 
     // 修改资源
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<CourseWare> update(@Valid @RequestBody WareDTO wareDTO) {
-        if (wareDTO.getId() == null) {
+    public APIResult<CourseWare> update(@Valid @RequestBody CourseWareDTO courseWareDTO) {
+        if (courseWareDTO.getId() == null) {
             return APIResult.error(APICode.error("参数错误: id"));
         }
 
-        return wareService.update(wareDTO);
+        return wareService.update(courseWareDTO);
     }
 
     // 删除资源

rankin-product-service/src/main/java/cn/rankin/productservice/service/WareService.java

@@ -3,7 +3,7 @@ package cn.rankin.productservice.service;
 import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.product.dto.WareDTO;
+import cn.rankin.data.api.product.dto.CourseWareDTO;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.util.JpaSortUtil;
@@ -46,8 +46,8 @@ public class WareService {
     }
 
     @Transactional
-    public APIResult<CourseWare> create(WareDTO wareDTO) {
-        CourseWare CourseWare = convert(wareDTO);
+    public APIResult<CourseWare> create(CourseWareDTO courseWareDTO) {
+        CourseWare CourseWare = convert(courseWareDTO);
         if (exists(CourseWare.getCode())) {
             return APIResult.error(APICode.ALREADY_EXISTS);
         }
@@ -56,8 +56,8 @@ public class WareService {
     }
 
     @Transactional
-    public APIResult<CourseWare> update(WareDTO wareDTO) {
-        CourseWare CourseWare = convert(wareDTO);
+    public APIResult<CourseWare> update(CourseWareDTO courseWareDTO) {
+        CourseWare CourseWare = convert(courseWareDTO);
         CourseWare result = wareRepository.update(CourseWare);
 
         return APIResult.ok(result);

rankin-product-service/src/main/java/cn/rankin/productservice/service/auth/AuthService.java

@@ -83,14 +83,14 @@ public class AuthService {
                 authResult.setEndTime(authVo.getEndTime());
                 continue;
             }
-            Long endTime = authResult.getEndTime();
-            Long startTime = authVo.getStartTime();
-            if (endTime < startTime) {
+            Long preEndTime = authResult.getEndTime();
+            Long curStartTime = authVo.getStartTime();
+            if (preEndTime < curStartTime) {
                 break;
             }
-            authResult.setEndTime(startTime);
-            if (i == authVoList.size()) {
-                authResult.setEndTime(authVo.getEndTime());
+            Long curEndTime = authVo.getEndTime();
+            if (curEndTime > preEndTime) {
+                authResult.setEndTime(curEndTime);
             }
         }
         return APIResult.ok(authResult);

rankin-product-service/src/main/java/cn/rankin/productservice/utils/DTOConverter.java

@@ -3,7 +3,6 @@ package cn.rankin.productservice.utils;
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.enums.CourseSubTypeEnum;
 import cn.rankin.common.utils.enums.ProductTypeEnum;
-import cn.rankin.data.api.app.vo.ItemVo;
 import cn.rankin.data.api.product.dto.*;
 import cn.rankin.data.api.product.entity.*;
 import cn.rankin.data.api.product.entity.Package;
@@ -22,9 +21,9 @@ public class DTOConverter {
     }
 
     // WareDTO to Ware
-    public static CourseWare convert(WareDTO wareDTO) {
+    public static CourseWare convert(CourseWareDTO courseWareDTO) {
         CourseWare CourseWare = new CourseWare();
-        BeanUtils.copyProperties(wareDTO, CourseWare);
+        BeanUtils.copyProperties(courseWareDTO, CourseWare);
         return CourseWare;
     }
 

rankin-resource-service/src/main/java/cn/rankin/resourceservice/controller/ResourceController.java

@@ -5,13 +5,12 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.dto.resource.ResourceSearchDTO;
 import cn.rankin.data.api.resource.entity.Resource;
-import cn.rankin.common.utils.enums.ResourceType;
+import cn.rankin.common.utils.constant.ResourceType;
 import cn.rankin.resourceservice.service.ResourceService;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceDetail.java

@@ -2,7 +2,7 @@ package cn.rankin.resourceservice.dto;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.data.api.resource.entity.Resource;
-import cn.rankin.common.utils.enums.ResourceType;
+import cn.rankin.common.utils.constant.ResourceType;
 import lombok.Data;
 import lombok.ToString;
 

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceRemote.java

@@ -6,7 +6,7 @@ import javax.persistence.*;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.data.api.resource.entity.Resource;
-import cn.rankin.common.utils.enums.ResourceType;
+import cn.rankin.common.utils.constant.ResourceType;
 import lombok.Data;
 
 @Data

rankin-user-service/src/main/java/cn/rankin/userservice/utils/StudentNumberUtil.java

@@ -75,11 +75,12 @@ public class StudentNumberUtil {
     public static void main(String[] args) {
 //        StudentNo a = getStudentNo("0222", "11", 99);
 //        System.out.println(a.getCampusNo());
-        int[] a = {0, 1, 9, 10, 11, 19, 50, 71, 99, 100, 101, 120, 121, 301, 501, 900, 901, 999, 1000, 10000, 10001, 11001, 11100, 11101, 11110, 11111};
+        int[] a = {0, 1, 9, 10, 11, 19, 20, 50, 71, 99, 100, 101, 120, 121, 301, 501, 900, 901, 999, 1000, 10000, 10001, 11001, 11100, 11101, 11110, 11111};
 //        System.out.println('9' - '0');
         for (int i : a) {
             System.out.println(toChinese(i));
         }
+        System.out.println('2' - '0');
     }
 
     public static String toChinese(Integer value, String prefix) {
@@ -97,7 +98,7 @@ public class StudentNumberUtil {
             return  "零";
         }else if (value > 0 && value <= 10) {
             result = LOW[value];
-        }else if (value > 10 && value <= 20) {
+        }else if (value > 10 && value < 20) {
             result = HIGH[0] + LOW[value % 10];
         }else {
             int n = string.length();