1

zj

2025-08-12 f8c80b2848a6b2e3ef16db317147576f4a4e0714

1

 src/main/java/project/web/admin/googleauth/AdminGoogleAuthController.java

@@ -625,32 +625,10 @@
     */
    @RequestMapping(action + "checkGoogleAuthCodeForLogin.action")
    public ModelAndView checkGoogleAuthCodeForLogin(HttpServletRequest request) {
		
        String google_auth_code = request.getParameter("google_auth_code");
		

        ModelAndView model = new ModelAndView();
        String username = this.getUsername_login();
        try {
            Syspara para = sysparaService.find("open_google_auth_code");
            if (null == para || para.getValue().equals("true")) {
                googleAuthService.checkGoogleAuthCodeForLogin(this.getIp(), username, google_auth_code,
                        this.getRequest().getRequestURI());
            }
            model.setViewName("redirect:/normal/LoginSuccessAction!view.action");
            return model;
			
        } catch (BusinessException e) {
            model.addObject("error", e.getMessage());
            model.addObject("username", username);
            model.setViewName("include/google_auth_code");
            return model;
        } catch (Throwable t) {
            logger.error(" error ", t);
            model.addObject("username", username);
            model.addObject("error", "验证码错误");
            model.setViewName("include/google_auth_code");
            return model;
        }
        model.setViewName("redirect:/normal/LoginSuccessAction!view.action");
        return model;
    }
    
    public void saveLog(SecUser secUser, String operator,String context) {

 src/main/java/project/web/api/MoneyLogController.java

@@ -1,8 +1,10 @@
package project.web.api;

import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;

import javax.servlet.http.HttpServletRequest;

@@ -67,8 +69,10 @@
            for (MoneyLog log : (List<MoneyLog>) pagedQuery.getElements()) {
                if(Constants.MONEYLOG_CONTENT_FINANCE_PROFIT.equals(log.getContent_type())) {
                    log.setAmount(log.getAmount()+amount);
                    log.setCreateTimeStr(DateUtils.format(log.getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
                }
                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
                log.setCreateTimeStr(simpleDateFormat.format(log.getCreateTime()));
            }
            resultObject.setData(pagedQuery.getElements());
        } catch (BusinessException e) {