Skip to content

涂亚平 / subsidy

Go to a project
Commit 8c908d8a by 涂亚平
Options

Merge remote-tracking branch 'origin/92-online版本' into 20220914-online版本 

# Conflicts:
#	src/main/java/com/subsidy/service/impl/ClassDictServiceImpl.java
#	src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
#	src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
2 parents a830b155 7b7d4fd6
Inline Side-by-side
Showing with 76 additions and 13 deletions
pom.xml
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>subsidy</finalName> <finalName>subsidy-online</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
src/main/java/com/subsidy/common/interceptor/AuthenticationInterceptor.java
...@@ -60,14 +60,14 @@ public class AuthenticationInterceptor implements HandlerInterceptor { ...@@ -60,14 +60,14 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
HandlerMethod handlerMethod = (HandlerMethod) handler; HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod(); Method method = handlerMethod.getMethod();
TimeRequired timeRequired = method.getAnnotation(TimeRequired.class); // TimeRequired timeRequired = method.getAnnotation(TimeRequired.class);
if (timeRequired !=null){ // if (timeRequired !=null){
Calendar calendar = Calendar.getInstance(); // Calendar calendar = Calendar.getInstance();
int hour = calendar.get(Calendar.HOUR_OF_DAY); // int hour = calendar.get(Calendar.HOUR_OF_DAY);
if (hour<6){ // if (hour<6){
throw new HttpException(17001); // throw new HttpException(17001);
} // }
} // }
LoginRequired methodAnnotation = method.getAnnotation(LoginRequired.class); LoginRequired methodAnnotation = method.getAnnotation(LoginRequired.class);
if (methodAnnotation != null) { if (methodAnnotation != null) {
......
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
...@@ -521,6 +521,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -521,6 +521,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
classDetailVO.setSignCounts(set); classDetailVO.setSignCounts(set);
//人所在部门
List<DepartmentDictDO> departmentDictDOS = memberMapper.getDepartments(classDetailVO.getId());
classDetailVO.setDeps(departmentDictDOS);
} }
classDetailVOIPage.setRecords(classDetailVOS); classDetailVOIPage.setRecords(classDetailVOS);
return classDetailVOIPage; return classDetailVOIPage;
......
src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
...@@ -631,7 +631,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper, ...@@ -631,7 +631,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
public HashSet<Long> testPlays(VodPlayHistoryDO vodPlayHistoryDO) { public HashSet<Long> testPlays(VodPlayHistoryDO vodPlayHistoryDO) {
String classIds = ""; String classIds = "286,292,350,355,302,366,379,367,368,371,374,373";
String[] classIdArr = classIds.split(","); String[] classIdArr = classIds.split(",");
......
src/main/java/com/subsidy/vo/classdict/ClassDetailVO.java
package com.subsidy.vo.classdict; package com.subsidy.vo.classdict;
import com.subsidy.model.DepartmentDictDO;
import com.subsidy.util.excel.ExcelColumn; import com.subsidy.util.excel.ExcelColumn;
import com.subsidy.vo.done.GetMaxScoreVO; import com.subsidy.vo.done.GetMaxScoreVO;
import lombok.Data; import lombok.Data;
...@@ -90,6 +91,7 @@ public class ClassDetailVO{ ...@@ -90,6 +91,7 @@ public class ClassDetailVO{
private List<GetMaxScoreVO> getMaxScoreVOS; private List<GetMaxScoreVO> getMaxScoreVOS;
private List<DepartmentDictDO> deps;
/** /**
* 公司名称 * 公司名称
*/ */
......
src/main/resources/application-dev.properties
# 本地环境配置 # 本地环境配置
spring.server.port=23457 spring.server.port=23462
# 数据源配置 # 数据源配置
spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
......
src/main/resources/application-online.properties 0 → 100644
# 本地环境配置
spring.server.port=23462
# 数据源配置
spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=ykadmin_new
#spring.datasource.password=youkedb608@good
spring.datasource.username=devloper
spring.datasource.password=dev@1553$
spring.datasource.druid.initialSize=5
spring.datasource.druid.minIdle=5
spring.datasource.druid.maxActive=200
spring.datasource.druid.maxWait=60000
spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
spring.datasource.druid.minEvictableIdleTimeMillis=300000
spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
spring.datasource.druid.testWhileIdle=true
spring.datasource.druid.testOnBorrow=false
spring.datasource.druid.testOnReturn=false
spring.datasource.druid.poolPreparedStatements=true
spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
spring.datasource.druid.useGlobalDataSourceStat=true
# 控制台日志打印
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
#spring.redis.host=r-uf6meywj6ysuehg148pd.redis.rds.aliyuncs.com
#spring.redis.password=r-uf6meywj6ysuehg148:Ykhl@208
#spring.redis.port=6379
#spring.redis.lettuce.pool.max-idle=16
#spring.redis.lettuce.pool.max-active=32
#spring.redis.lettuce.pool.min-idle=8
#spring.application.name=spring-boot-mongodb
## mongodb
##spring.data.mongodb.uri=mongodb://47.97.19.66:27017/subsidy
#spring.data.mongodb.username=root
#spring.data.mongodb.password=123456
##spring.data.mongodb.authentication-database=subsidy
#spring.data.mongodb.database=subsidy
#spring.data.mongodb.host=47.97.19.66
#spring.data.mongodb.port=27017
spring.redis.host=47.97.19.66
spring.redis.password=Ykhl@208
spring.redis.port=6389
spring.redis.lettuce.pool.max-idle=16
spring.redis.lettuce.pool.max-active=32
spring.redis.lettuce.pool.min-idle=8
qxueyou.appId=qxywz5nnWMI77CM3Tx
qxueyou.securityKey=626737T1-65K0-5xC2-0Y0V-2Aq95qxy
qxueyou.url=https://dev.qxueyou.com/auth/user/token
\ No newline at end of file
src/main/resources/application.properties
# 环境配置 # 环境配置
spring.profiles.active=dev spring.profiles.active=online
#和CPU数 #和CPU数
spring.server.acceptorThreadCount=600 spring.server.acceptorThreadCount=600
spring.server.minSpareThreads=100 spring.server.minSpareThreads=100
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!