Merge branch 'PrivateReleaseWithRelease' into 'Develop'

Private release with release







See merge request !892

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/aspect/PointAspect.java

@@ -2,7 +2,9 @@ package cn.iselab.mooctest.site.common.aspect;
 
 import cn.iselab.mooctest.rpc.user.data.AddIntegralDTO;
 import cn.iselab.mooctest.site.common.annotation.PointChange;
+import cn.iselab.mooctest.site.configure.ClientFeatureConfiguration;
 import cn.iselab.mooctest.site.rpc.user.IntegralService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -20,23 +22,27 @@ import java.lang.reflect.Method;
  */
 @Aspect
 @Component
+@Slf4j
 public class PointAspect {
 
     @Autowired
     IntegralService integralService;
+    @Autowired
+    private ClientFeatureConfiguration clientFeatureConfiguration;
 
     @Pointcut("@annotation(pointChange)")
     private void pointcut(PointChange pointChange){}
 
     @AfterReturning("pointcut(pointChange)")
     public void afterReturning(PointChange pointChange) {
-
-        Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute("userId");
-        AddIntegralDTO dto=new AddIntegralDTO();
-        dto.setUserId(userId);
-        dto.setEvent(pointChange.value());
-        integralService.checkIntegral(dto);
-        System.out.println("Point Change : user="+userId+" event="+pointChange.value());
+        if(clientFeatureConfiguration.isMedal()) {
+            Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute("userId");
+            AddIntegralDTO dto = new AddIntegralDTO();
+            dto.setUserId(userId);
+            dto.setEvent(pointChange.value());
+            integralService.checkIntegral(dto);
+            System.out.println("Point Change : user=" + userId + " event=" + pointChange.value());
+        }
 
     }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/UserLogicImpl.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.iselab.mooctest.rpc.user.data.UserIntegralDTO;
 import cn.iselab.mooctest.site.common.annotation.PointChange;
 import cn.iselab.mooctest.site.common.constant.Constants;
+import cn.iselab.mooctest.site.configure.ClientFeatureConfiguration;
 import cn.iselab.mooctest.site.configure.realm.DefaultUsernamepasswordToken;
 import cn.iselab.mooctest.site.dao.UserDao;
 import cn.iselab.mooctest.site.data.UserDTOForMT;
@@ -39,6 +40,7 @@ import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -113,6 +115,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Autowired
     private IntegralService integralService;
 
+    @Autowired
+    private ClientFeatureConfiguration clientFeatureConfiguration;
+
     private UserDTOForMT transfer(UserVO userVO) {
         return Converter.convert(UserDTOForMT.class, userVO);
     }
@@ -759,9 +764,13 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         userVO.setMenuVOs(menuVOs);
         userVO.setOpenId(openId2UserIdService.findOpenIdByUserId(userVO.getId()));
         userVO.setPassword("");
-        UserIntegralDTO integralDTO=integralService.getUserIntegral(userVO.getId());
-        if (integralDTO!=null) {
-            userVO.setIntegral(integralDTO.getTotal());
+        if(clientFeatureConfiguration.isMedal()) {
+            UserIntegralDTO integralDTO=integralService.getUserIntegral(userVO.getId());
+            if (integralDTO!=null) {
+                userVO.setIntegral(integralDTO.getTotal());
+            }
+        }else {
+            LOG.info("私有云不进行积分初始化");
         }
 
         if (managerPropertyService.getManagerPropertyByUserId(userVO.getId()) != null) {

mooctest-site-server/src/main/resources/application.yaml

@@ -51,6 +51,7 @@ featureSwitch:
         oss: false
         webide: false
         wechat: false
+        medal: false
     server:
         rpcDevService: false
         mongoServer: true
@@ -104,4 +105,8 @@ mongodb:
 
 celeryServer:
     host: 127.0.0.1
-    port: 5002
+    port: 5002
+
+cache:
+    expire:
+        duration: 60