Merge remote-tracking branch 'origin/dev' into qcloud

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/ScoreServiceImpl.java

@@ -101,6 +101,7 @@ public class ScoreServiceImpl implements ScoreService{
     }
 
     @Override
+    @Transactional
     public void delete(Long id) {
         if (StringUtils.isEmpty(id) || "0".equals(id)) {
             return;

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/controller/AccountController.java

@@ -5,8 +5,6 @@ import com.usoftchina.smartschool.account.dto.AccountRegDTO;
 import com.usoftchina.smartschool.account.po.Account;
 import com.usoftchina.smartschool.account.service.AccountService;
 import com.usoftchina.smartschool.base.Result;
-import com.usoftchina.smartschool.context.BaseContextHolder;
-import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.exception.ExceptionCode;
 import com.usoftchina.smartschool.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,12 +101,12 @@ public class AccountController {
      * @return
      */
     @PostMapping("/password/reset")
-    public Result resetPassword(@RequestParam("password") String password){
-        Account account = accountService.findByPrimaryKey(BaseContextHolder.getUserId());
+    public Result resetPassword(@RequestParam("password") String password, @RequestParam("userId") Long userId){
+        Account account = accountService.findByPrimaryKey(userId);
         if (null == account) {
             return Result.error(ExceptionCode.USER_NOT_EXIST);
         }
-        account.setId(BaseContextHolder.getUserId());
+        account.setId(userId);
         account.setUser_pass(accountService.getEncryptedPassword(password, account.getSalt()));
         accountService.updateByPrimaryKeySelective(account);
         return Result.success();

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/interceptor/AuthRestInterceptor.java

@@ -32,14 +32,15 @@ public class AuthRestInterceptor extends HandlerInterceptorAdapter {
                 token = headers.nextElement();
             }
             if (!StringUtils.isEmpty(token)) {
-                JwtInfo infoFromToken = JwtHelper.getInfoFromToken(token, "auth/pub.key");
+                logger.debug("token={}", token);
+                /*JwtInfo infoFromToken = JwtHelper.getInfoFromToken(token, "auth/pub.key");
                 BaseContextHolder.setAppId(infoFromToken.getAppId());
                 BaseContextHolder.setUserId(infoFromToken.getUserId());
                 BaseContextHolder.setUserName(infoFromToken.getUserName());
                 BaseContextHolder.setSchoolId(infoFromToken.getSchool_id());
                 BaseContextHolder.setToken(token);
                 logger.info("request={} school_id={} token={} \\r\\n userName={}  ", request.getRequestURI(),
-                        infoFromToken.getSchool_id(), token, infoFromToken.getUserName());
+                        infoFromToken.getSchool_id(), token, infoFromToken.getUserName());*/
             }
         } else {
             // no mapping

frontend/pc-web/app/view/main/MainController.js

@@ -110,11 +110,12 @@ Ext.define('school.view.main.MainController', {
                         handler: function(btn) {
                             var window = btn.up('window'),
                             form = window.down('form'),
-                            values = form.getValues();
+                            values = form.getValues(),
+                            userId = school.util.BaseUtil.getCurrentUser().id;
     
                             window.setLoading(true);
                             school.util.BaseUtil.request({
-                                url: '/api/account/account/password/reset?password=' + values.password1,
+                                url: '/api/account/account/password/reset?password=' + values.password1 + '&userId=' + userId,
                                 method: 'POST',
                             }).then(function(res) {
                                 window.setLoading(false);