Commit ec34c5e0 by 魏文甫

update

1 parent d0d24e35
...@@ -216,6 +216,12 @@ ...@@ -216,6 +216,12 @@
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>local</id>
<properties>
<package.environment>local</package.environment>
</properties>
</profile>
<profile>
<id>online</id> <id>online</id>
<properties> <properties>
<package.environment>online</package.environment> <package.environment>online</package.environment>
......
...@@ -72,6 +72,7 @@ public class IndexServiceImpl implements IndexService { ...@@ -72,6 +72,7 @@ public class IndexServiceImpl implements IndexService {
for (TBaseFirstClass tBaseFirstClass : list) { for (TBaseFirstClass tBaseFirstClass : list) {
flagMap = new HashMap<String, Object>(); flagMap = new HashMap<String, Object>();
flagMap.put("className", tBaseFirstClass.getClassName()); flagMap.put("className", tBaseFirstClass.getClassName());
flagMap.put("id", tBaseFirstClass.getId());
List<Map<String, Object>> list2 = informationMapper.categoryDetail(tBaseFirstClass.getId()); List<Map<String, Object>> list2 = informationMapper.categoryDetail(tBaseFirstClass.getId());
flagMap.put("informationList", list2); flagMap.put("informationList", list2);
...@@ -84,7 +85,7 @@ public class IndexServiceImpl implements IndexService { ...@@ -84,7 +85,7 @@ public class IndexServiceImpl implements IndexService {
public Map<String, Object> livingCourseToday() { public Map<String, Object> livingCourseToday() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("today",simpleDateFormat.format(new Date())); param.put("today", simpleDateFormat.format(new Date()));
List<Map<String, Object>> list = courseMapper.livingCourseToday(param); List<Map<String, Object>> list = courseMapper.livingCourseToday(param);
return returnMap("1", "", list); return returnMap("1", "", list);
} }
......
...@@ -45,7 +45,7 @@ public class UserController extends BaseController { ...@@ -45,7 +45,7 @@ public class UserController extends BaseController {
} }
if (user == null) { if (user == null) {
return returnError("0", "未登录", null); return returnError("0", "请先授权!", null);
} }
ValueOperations operations = redisTemplate.opsForValue(); ValueOperations operations = redisTemplate.opsForValue();
...@@ -73,7 +73,8 @@ public class UserController extends BaseController { ...@@ -73,7 +73,8 @@ public class UserController extends BaseController {
user.setFullName(fullName); user.setFullName(fullName);
user.setPhone(phone); user.setPhone(phone);
user.setStatus(1); user.setStatus(1);
user.setIntegral(0);
user.setLastLoginDt(new Date());
userMapper.insertSelective(user); userMapper.insertSelective(user);
request.getSession().setAttribute(WX_USER_SESSION_KEY, user); request.getSession().setAttribute(WX_USER_SESSION_KEY, user);
......
...@@ -16,7 +16,7 @@ mybatis.config-location=classpath:mybatis/mybatis-config.xml ...@@ -16,7 +16,7 @@ mybatis.config-location=classpath:mybatis/mybatis-config.xml
# Redis数据库索引(默认为0) # Redis数据库索引(默认为0)
spring.redis.database=0 spring.redis.database=0
# Redis服务器地址 # Redis服务器地址
spring.redis.host=192.168.0.105 spring.redis.host=39.97.246.118
# Redis服务器连接端口 # Redis服务器连接端口
spring.redis.port=6379 spring.redis.port=6379
# Redis服务器连接密码(默认为空) # Redis服务器连接密码(默认为空)
......
log4j.rootLogger=ERROR,stdout,E log4j.rootLogger=ERROR,stdout,E
log4j.logger.com.server.web.common.mapper=ERROR log4j.logger.com.server.web.common.mapper=debug
log4j.logger.com.server.web.common.mapping=debug
##########控制台############# ##########控制台#############
log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout = org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target = System.out log4j.appender.stdout.Target = System.out
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!