From dce6ffdc52bbba0c28d761fcd1c5659840f0bba9 Mon Sep 17 00:00:00 2001
From: lisy <java@lishouyideAir.lan>
Date: 星期三, 14 六月 2023 13:06:57 +0800
Subject: [PATCH] 修复了部分bug
---
cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java | 6 -
cloud-server-course/pom.xml | 7 -
cloud-server-account/src/main/java/com/dsh/account/entity/TStudent.java | 2
cloud-server-other/src/main/java/com/dsh/other/mapper/TImgConfigMapper.java | 4
cloud-server-other/pom.xml | 5 -
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java | 2
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 4
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/CourseVenue.java | 2
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 8 +-
cloud-server-other/src/main/java/com/dsh/other/service/TImgConfigService.java | 4
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/WeekedCourse.java | 2
cloud-server-other/src/main/java/com/dsh/other/entity/TImgConfig.java | 18 ++--
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuDetailsReq.java | 2
cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java | 4
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java | 2
cloud-server-account/src/main/resources/mapper/TStudentMapper.xml | 4
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 17 ++--
cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java | 4
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java | 4
cloud-server-account/pom.xml | 5 -
cloud-server-account/src/main/java/com/dsh/account/mapper/TAppUserMapper.java | 4
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/ClassInfoVo.java | 8 +-
cloud-server-other/src/main/resources/mapper/TImgConfigMapper.xml | 4
cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java | 12 --
cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml | 4
/dev/null | 53 -------------
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 21 ++--
cloud-server-other/src/main/java/com/dsh/other/service/impl/TImgConfigServiceImpl.java | 8 +-
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/TImgConfig.java | 4
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 6
32 files changed, 77 insertions(+), 157 deletions(-)
diff --git a/cloud-server-account/pom.xml b/cloud-server-account/pom.xml
index 48b7de2..f138c5d 100644
--- a/cloud-server-account/pom.xml
+++ b/cloud-server-account/pom.xml
@@ -106,11 +106,6 @@
<version>2.3.30</version>
</dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jpa</artifactId>
- <version>1.11.4.RELEASE</version>
- </dependency>
</dependencies>
diff --git a/cloud-server-account/src/main/java/com/dsh/app/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
similarity index 89%
rename from cloud-server-account/src/main/java/com/dsh/app/controller/ClassDetailsController.java
rename to cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index fb537ce..4206d97 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -1,16 +1,15 @@
-package com.dsh.app.controller;
+package com.dsh.account.controller;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
import com.dsh.account.util.DateUtil;
-import com.dsh.app.entity.TStudent;
-import com.dsh.app.model.vo.classDetails.classInsVo.ClassInfoVo;
-import com.dsh.app.model.vo.classDetails.classInsVo.StuDetailsReq;
-import com.dsh.app.model.vo.classDetails.classInsVo.StuListVo;
-import com.dsh.app.model.vo.classDetails.classInsVo.StuPhysicalVo;
-import com.dsh.app.service.TAppUserService;
-import com.dsh.app.service.TStudentService;
+import com.dsh.account.entity.TStudent;
+import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
+import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo;
+import com.dsh.account.model.vo.classDetails.classInsVo.StuPhysicalVo;
+import com.dsh.account.service.TAppUserService;
+import com.dsh.account.service.TStudentService;
import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/entity/TAppUser.java b/cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java
similarity index 92%
rename from cloud-server-account/src/main/java/com/dsh/app/entity/TAppUser.java
rename to cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java
index d957625..f93d94c 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/entity/TAppUser.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java
@@ -1,15 +1,11 @@
-package com.dsh.app.entity;
+package com.dsh.account.entity;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.Version;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/entity/TStudent.java b/cloud-server-account/src/main/java/com/dsh/account/entity/TStudent.java
similarity index 97%
rename from cloud-server-account/src/main/java/com/dsh/app/entity/TStudent.java
rename to cloud-server-account/src/main/java/com/dsh/account/entity/TStudent.java
index 4bbdde8..972663b 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/entity/TStudent.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/TStudent.java
@@ -1,4 +1,4 @@
-package com.dsh.app.entity;
+package com.dsh.account.entity;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/feignclient/other/ImgConfigClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
similarity index 74%
rename from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/ImgConfigClient.java
rename to cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
index 47db28d..c310ffd 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/feignclient/other/ImgConfigClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
@@ -1,6 +1,6 @@
-package com.dsh.app.feignclient.other;
+package com.dsh.account.feignclient.other;
-import com.dsh.app.feignclient.other.model.TImgConfig;
+import com.dsh.account.feignclient.other.model.TImgConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/TImgConfig.java
similarity index 86%
copy from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
copy to cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/TImgConfig.java
index e514176..c71757f 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/TImgConfig.java
@@ -1,12 +1,10 @@
-package com.dsh.app.feignclient.other.model;
+package com.dsh.account.feignclient.other.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import java.io.Serializable;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/mapper/TAppUserMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/TAppUserMapper.java
similarity index 75%
rename from cloud-server-account/src/main/java/com/dsh/app/mapper/TAppUserMapper.java
rename to cloud-server-account/src/main/java/com/dsh/account/mapper/TAppUserMapper.java
index 6498dd7..0db7df9 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/mapper/TAppUserMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/TAppUserMapper.java
@@ -1,6 +1,6 @@
-package com.dsh.app.mapper;
+package com.dsh.account.mapper;
-import com.dsh.app.entity.TAppUser;
+import com.dsh.account.entity.TAppUser;
import com.baomidou.mybatisplus.mapper.BaseMapper;
/**
diff --git a/cloud-server-account/src/main/java/com/dsh/app/mapper/TStudentMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
similarity index 75%
rename from cloud-server-account/src/main/java/com/dsh/app/mapper/TStudentMapper.java
rename to cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
index 2c2e23f..bb28ded 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/mapper/TStudentMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
@@ -1,6 +1,6 @@
-package com.dsh.app.mapper;
+package com.dsh.account.mapper;
-import com.dsh.app.entity.TStudent;
+import com.dsh.account.entity.TStudent;
import com.baomidou.mybatisplus.mapper.BaseMapper;
/**
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/CourseVenue.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/CourseVenue.java
similarity index 93%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/CourseVenue.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/CourseVenue.java
index 5f3f135..c34e411 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/CourseVenue.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/CourseVenue.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails;
+package com.dsh.account.model.vo.classDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/ExerciseVideo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java
similarity index 88%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/ExerciseVideo.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java
index 7eb041f..a2e9ee6 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/ExerciseVideo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails;
+package com.dsh.account.model.vo.classDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/RegisteredCourse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java
similarity index 84%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/RegisteredCourse.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java
index 338b467..aebe1fe 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/RegisteredCourse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/RegisteredCourse.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails;
+package com.dsh.account.model.vo.classDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/WeekedCourse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/WeekedCourse.java
similarity index 90%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/WeekedCourse.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/WeekedCourse.java
index cf0a1ea..4f63b67 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/WeekedCourse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/WeekedCourse.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails;
+package com.dsh.account.model.vo.classDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/ClassInfoVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/ClassInfoVo.java
similarity index 85%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/ClassInfoVo.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/ClassInfoVo.java
index c1f8d3c..27360aa 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/ClassInfoVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/ClassInfoVo.java
@@ -1,9 +1,9 @@
-package com.dsh.app.model.vo.classDetails.classInsVo;
+package com.dsh.account.model.vo.classDetails.classInsVo;
-import com.dsh.app.model.vo.classDetails.ExerciseVideo;
-import com.dsh.app.model.vo.classDetails.RegisteredCourse;
-import com.dsh.app.model.vo.classDetails.WeekedCourse;
+import com.dsh.account.model.vo.classDetails.ExerciseVideo;
+import com.dsh.account.model.vo.classDetails.RegisteredCourse;
+import com.dsh.account.model.vo.classDetails.WeekedCourse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuDetailsReq.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuDetailsReq.java
similarity index 92%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuDetailsReq.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuDetailsReq.java
index 5455c58..78f8fdf 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuDetailsReq.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuDetailsReq.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails.classInsVo;
+package com.dsh.account.model.vo.classDetails.classInsVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuListVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
similarity index 91%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuListVo.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
index 1e061d4..a641616 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuListVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails.classInsVo;
+package com.dsh.account.model.vo.classDetails.classInsVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuPhysicalVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java
similarity index 74%
rename from cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuPhysicalVo.java
rename to cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java
index b7fa114..343b8be 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/model/vo/classDetails/classInsVo/StuPhysicalVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuPhysicalVo.java
@@ -1,4 +1,4 @@
-package com.dsh.app.model.vo.classDetails.classInsVo;
+package com.dsh.account.model.vo.classDetails.classInsVo;
import lombok.Data;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
similarity index 64%
rename from cloud-server-account/src/main/java/com/dsh/app/service/TAppUserService.java
rename to cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index c36ed8a..f1709fe 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -1,8 +1,8 @@
-package com.dsh.app.service;
+package com.dsh.account.service;
-import com.dsh.app.entity.TAppUser;
+import com.dsh.account.entity.TAppUser;
import com.baomidou.mybatisplus.service.IService;
-import com.dsh.app.model.vo.classDetails.classInsVo.ClassInfoVo;
+import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
/**
* <p>
diff --git a/cloud-server-account/src/main/java/com/dsh/app/service/TStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
similarity index 74%
rename from cloud-server-account/src/main/java/com/dsh/app/service/TStudentService.java
rename to cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
index b118478..e8c837b 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/service/TStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -1,6 +1,6 @@
-package com.dsh.app.service;
+package com.dsh.account.service;
-import com.dsh.app.entity.TStudent;
+import com.dsh.account.entity.TStudent;
import com.baomidou.mybatisplus.service.IService;
/**
diff --git a/cloud-server-account/src/main/java/com/dsh/app/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
similarity index 73%
rename from cloud-server-account/src/main/java/com/dsh/app/service/impl/TAppUserServiceImpl.java
rename to cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 06ae43c..e401e8d 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1,19 +1,20 @@
-package com.dsh.app.service.impl;
+package com.dsh.account.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.dsh.app.entity.TAppUser;
-import com.dsh.app.entity.TStudent;
-import com.dsh.app.feignclient.other.ImgConfigClient;
-import com.dsh.app.feignclient.other.model.TImgConfig;
-import com.dsh.app.mapper.TAppUserMapper;
-import com.dsh.app.mapper.TStudentMapper;
-import com.dsh.app.model.vo.classDetails.classInsVo.ClassInfoVo;
-import com.dsh.app.service.TAppUserService;
+import com.dsh.account.mapper.TStudentMapper;
+import com.dsh.account.feignclient.other.ImgConfigClient;
+import com.dsh.account.feignclient.other.model.TImgConfig;
+import com.dsh.account.service.TAppUserService;
+import com.dsh.account.entity.TAppUser;
+import com.dsh.account.entity.TStudent;
+import com.dsh.account.mapper.TAppUserMapper;
+import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.dsh.account.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -30,7 +31,7 @@
@Autowired
private TStudentMapper tsmapper;
- @Autowired
+ @Resource
private ImgConfigClient configClient;
@Override
diff --git a/cloud-server-account/src/main/java/com/dsh/app/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
similarity index 65%
rename from cloud-server-account/src/main/java/com/dsh/app/service/impl/TStudentServiceImpl.java
rename to cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index a70a897..dd46b96 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -1,8 +1,8 @@
-package com.dsh.app.service.impl;
+package com.dsh.account.service.impl;
-import com.dsh.app.entity.TStudent;
-import com.dsh.app.mapper.TStudentMapper;
-import com.dsh.app.service.TStudentService;
+import com.dsh.account.entity.TStudent;
+import com.dsh.account.mapper.TStudentMapper;
+import com.dsh.account.service.TStudentService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
index fe20ba7..1277a14 100644
--- a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.app.mapper.TAppUserMapper">
+<mapper namespace="com.dsh.account.mapper.TAppUserMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.app.entity.TAppUser">
+ <resultMap id="BaseResultMap" type="com.dsh.account.entity.TAppUser">
<id column="id" property="id" />
<result column="code" property="code" />
<result column="name" property="name" />
diff --git a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
index d41bb61..ea3639f 100644
--- a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.app.mapper.TStudentMapper">
+<mapper namespace="com.dsh.account.mapper.TStudentMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.app.entity.TStudent">
+ <resultMap id="BaseResultMap" type="com.dsh.account.entity.TStudent">
<id column="id" property="id" />
<result column="appUserId" property="appUserId" />
<result column="name" property="name" />
diff --git a/cloud-server-course/pom.xml b/cloud-server-course/pom.xml
index 24636df..95aae90 100644
--- a/cloud-server-course/pom.xml
+++ b/cloud-server-course/pom.xml
@@ -82,13 +82,6 @@
<version>2.3.30</version>
</dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jpa</artifactId>
- <version>1.11.4.RELEASE</version>
- </dependency>
-
-
<dependency> <!--swagger2-->
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
diff --git a/cloud-server-other/pom.xml b/cloud-server-other/pom.xml
index 92e86ad..1c6fbcb 100644
--- a/cloud-server-other/pom.xml
+++ b/cloud-server-other/pom.xml
@@ -107,11 +107,6 @@
<version>2.3.30</version>
</dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jpa</artifactId>
- <version>1.11.4.RELEASE</version>
- </dependency>
</dependencies>
diff --git a/cloud-server-other/src/main/java/com/dsh/app/entity/TImgConfig.java b/cloud-server-other/src/main/java/com/dsh/app/entity/TImgConfig.java
deleted file mode 100644
index b86c73c..0000000
--- a/cloud-server-other/src/main/java/com/dsh/app/entity/TImgConfig.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.dsh.app.entity;
-
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.Version;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 图片配置
- * </p>
- *
- * @author administrator
- * @since 2023-06-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_img_config")
-public class TImgConfig extends Model<TImgConfig> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 位置（1=无学员，2=成为会员，3=我的券包，4=线上商城，5=本周福利，6=今日免费）
- */
- private Integer position;
- /**
- * 图片配置JSON
- */
- private String content;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
-}
diff --git a/cloud-server-other/src/main/java/com/dsh/app/controller/ImgConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
similarity index 68%
rename from cloud-server-other/src/main/java/com/dsh/app/controller/ImgConfigController.java
rename to cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
index 942f910..17019b6 100644
--- a/cloud-server-other/src/main/java/com/dsh/app/controller/ImgConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
@@ -1,17 +1,11 @@
-package com.dsh.app.controller;
+package com.dsh.other.controller;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.dsh.app.entity.TImgConfig;
-import com.dsh.app.service.TImgConfigService;
-import com.dsh.other.util.ResultUtil;
+import com.dsh.other.entity.TImgConfig;
+import com.dsh.other.service.TImgConfigService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java b/cloud-server-other/src/main/java/com/dsh/other/entity/TImgConfig.java
similarity index 86%
rename from cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
rename to cloud-server-other/src/main/java/com/dsh/other/entity/TImgConfig.java
index e514176..00a14a1 100644
--- a/cloud-server-account/src/main/java/com/dsh/app/feignclient/other/model/TImgConfig.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/TImgConfig.java
@@ -1,14 +1,14 @@
-package com.dsh.app.feignclient.other.model;
+package com.dsh.other.entity;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-
-import java.io.Serializable;
/**
* <p>
@@ -16,10 +16,12 @@
* </p>
*
* @author administrator
- * @since 2023-06-13
+ * @since 2023-06-14
*/
-@EqualsAndHashCode(callSuper = true)
@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_img_config")
public class TImgConfig extends Model<TImgConfig> {
private static final long serialVersionUID = 1L;
diff --git a/cloud-server-other/src/main/java/com/dsh/app/feignclient/ImgConfigClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
similarity index 79%
rename from cloud-server-other/src/main/java/com/dsh/app/feignclient/ImgConfigClient.java
rename to cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
index be547e7..b79bacd 100644
--- a/cloud-server-other/src/main/java/com/dsh/app/feignclient/ImgConfigClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
@@ -1,6 +1,6 @@
-package com.dsh.app.feignclient;
+package com.dsh.other.feignclient;
-import com.dsh.app.entity.TImgConfig;
+import com.dsh.other.entity.TImgConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/cloud-server-other/src/main/java/com/dsh/app/mapper/TImgConfigMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/TImgConfigMapper.java
similarity index 76%
rename from cloud-server-other/src/main/java/com/dsh/app/mapper/TImgConfigMapper.java
rename to cloud-server-other/src/main/java/com/dsh/other/mapper/TImgConfigMapper.java
index 485819f..9064e72 100644
--- a/cloud-server-other/src/main/java/com/dsh/app/mapper/TImgConfigMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/TImgConfigMapper.java
@@ -1,6 +1,6 @@
-package com.dsh.app.mapper;
+package com.dsh.other.mapper;
-import com.dsh.app.entity.TImgConfig;
+import com.dsh.other.entity.TImgConfig;
import com.baomidou.mybatisplus.mapper.BaseMapper;
/**
diff --git a/cloud-server-other/src/main/java/com/dsh/app/service/TImgConfigService.java b/cloud-server-other/src/main/java/com/dsh/other/service/TImgConfigService.java
similarity index 75%
rename from cloud-server-other/src/main/java/com/dsh/app/service/TImgConfigService.java
rename to cloud-server-other/src/main/java/com/dsh/other/service/TImgConfigService.java
index 58a02e2..3f90939 100644
--- a/cloud-server-other/src/main/java/com/dsh/app/service/TImgConfigService.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/TImgConfigService.java
@@ -1,6 +1,6 @@
-package com.dsh.app.service;
+package com.dsh.other.service;
-import com.dsh.app.entity.TImgConfig;
+import com.dsh.other.entity.TImgConfig;
import com.baomidou.mybatisplus.service.IService;
/**
diff --git a/cloud-server-other/src/main/java/com/dsh/app/service/impl/TImgConfigServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TImgConfigServiceImpl.java
similarity index 66%
rename from cloud-server-other/src/main/java/com/dsh/app/service/impl/TImgConfigServiceImpl.java
rename to cloud-server-other/src/main/java/com/dsh/other/service/impl/TImgConfigServiceImpl.java
index a200e01..a2be308 100644
--- a/cloud-server-other/src/main/java/com/dsh/app/service/impl/TImgConfigServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TImgConfigServiceImpl.java
@@ -1,8 +1,8 @@
-package com.dsh.app.service.impl;
+package com.dsh.other.service.impl;
-import com.dsh.app.entity.TImgConfig;
-import com.dsh.app.mapper.TImgConfigMapper;
-import com.dsh.app.service.TImgConfigService;
+import com.dsh.other.entity.TImgConfig;
+import com.dsh.other.mapper.TImgConfigMapper;
+import com.dsh.other.service.TImgConfigService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/cloud-server-other/src/main/resources/mapper/TImgConfigMapper.xml b/cloud-server-other/src/main/resources/mapper/TImgConfigMapper.xml
index 5a0a7c2..e9ade61 100644
--- a/cloud-server-other/src/main/resources/mapper/TImgConfigMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/TImgConfigMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.app.mapper.TImgConfigMapper">
+<mapper namespace="com.dsh.other.mapper.TImgConfigMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.app.entity.TImgConfig">
+ <resultMap id="BaseResultMap" type="com.dsh.other.entity.TImgConfig">
<id column="id" property="id" />
<result column="position" property="position" />
<result column="content" property="content" />
--
Gitblit v1.7.1