diff --git a/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java b/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java index 5f67a22..6030dfb 100644 --- a/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java +++ b/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.admin.config.dao.SuperEntity; -import java.math.BigInteger; import java.util.List; diff --git a/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java b/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java index 4efbd47..04725aa 100644 --- a/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java +++ b/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java @@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.admin.config.dao.SuperEntity; -import java.math.BigInteger; - - /** * The persistent class for the tiku_question database table. * diff --git a/tamguo-admin/src/main/java/com/tamguo/admin/model/SubjectEntity.java b/tamguo-admin/src/main/java/com/tamguo/admin/model/SubjectEntity.java index d4f2ae0..ff3a6ff 100644 --- a/tamguo-admin/src/main/java/com/tamguo/admin/model/SubjectEntity.java +++ b/tamguo-admin/src/main/java/com/tamguo/admin/model/SubjectEntity.java @@ -14,10 +14,6 @@ public class SubjectEntity extends SuperEntity implements Seriali private String name; - private String courseId; - - private String courseName; - @TableField(exist=false) private List courseList; @@ -29,22 +25,6 @@ public class SubjectEntity extends SuperEntity implements Seriali this.name = name; } - public String getCourseId() { - return courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getCourseName() { - return courseName; - } - - public void setCourseName(String courseName) { - this.courseName = courseName; - } - public List getCourseList() { return courseList; } diff --git a/tamguo-admin/src/main/java/com/tamguo/admin/service/impl/SubjectService.java b/tamguo-admin/src/main/java/com/tamguo/admin/service/impl/SubjectService.java index f01157f..9c99b8c 100644 --- a/tamguo-admin/src/main/java/com/tamguo/admin/service/impl/SubjectService.java +++ b/tamguo-admin/src/main/java/com/tamguo/admin/service/impl/SubjectService.java @@ -46,21 +46,11 @@ public class SubjectService implements ISubjectService{ public void update(SubjectEntity subject) { SubjectEntity entity = subjectMapper.selectById(subject.getUid()); entity.setName(subject.getName()); - if(!StringUtils.isEmpty(subject.getCourseId())){ - CourseEntity course = courseMapper.selectById(subject.getCourseId()); - entity.setCourseId(course.getUid()); - entity.setCourseName(course.getName()); - } subjectMapper.updateById(entity); } @Override public void save(SubjectEntity subject) { - if(!StringUtils.isEmpty(subject.getCourseId())){ - CourseEntity course = courseMapper.selectById(subject.getCourseId()); - subject.setCourseId(course.getUid()); - subject.setCourseName(course.getName()); - } subjectMapper.insert(subject); } diff --git a/tamguo-admin/src/main/resources/application.properties b/tamguo-admin/src/main/resources/application.properties index 253e8b9..d52d273 100644 --- a/tamguo-admin/src/main/resources/application.properties +++ b/tamguo-admin/src/main/resources/application.properties @@ -1,5 +1,5 @@ -domain.name=http://admin.tamguo.com/ -server.port=8082 +domain.name=http://localhost/ +server.port=80 jasypt.encryptor.password=tamguo spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 @@ -11,14 +11,14 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 spring.datasource.maxWait=60000 spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.minIdle=5 -spring.datasource.password= +spring.datasource.password=Tanguo spring.datasource.poolPreparedStatements=true spring.datasource.testOnBorrow=false spring.datasource.testOnReturn=false spring.datasource.testWhileIdle=true spring.datasource.timeBetweenEvictionRunsMillis=60000 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false +spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false spring.datasource.username=root spring.datasource.validationQuery=SELECT 1 FROM DUAL @@ -46,7 +46,7 @@ spring.thymeleaf.encoding=UTF-8 spring.thymeleaf.content-type=text/html spring.thymeleaf.cache=false -redis.hostname=127.0.0.1 +redis.hostname=47.100.175.14 redis.port=6379 redis.password= diff --git a/tamguo-admin/src/main/resources/mappers/SubjectMapper.xml b/tamguo-admin/src/main/resources/mappers/SubjectMapper.xml index 8d98d10..576fe9e 100644 --- a/tamguo-admin/src/main/resources/mappers/SubjectMapper.xml +++ b/tamguo-admin/src/main/resources/mappers/SubjectMapper.xml @@ -4,7 +4,7 @@