From 281145baca770c898898e3e759de254a74dab032 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 六月 2025 16:54:08 +0800
Subject: [PATCH] 更新川易充

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java           |    2 +-
 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java                                  |    2 +-
 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java                               |    2 +-
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java |    2 +-
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java                         |    4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index c443059..6833418 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -49,7 +49,7 @@
 		
 		if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
 			recordLogService.recordLogininfor(request, null, username, Constants.LOGIN_FAIL_STATUS, "登录用户不存在");
-			throw new ServiceException("登录用户:" + username + " 不存在");
+			throw new ServiceException("用户名/密码错误");
 		}
 		LoginUser userInfo = userResult.getData();
 		SysUser user = userResult.getData().getSysUser();
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
index 1f6a419..bb85a0f 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
@@ -64,7 +64,7 @@
             retryCount = retryCount + 1;
             recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, String.format("密码输入错误%s次", retryCount));
             redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
-            throw new ServiceException("密码错误");
+            throw new ServiceException("用户名/密码错误");
         }
         else
         {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index acca8a1..a690ee2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -494,7 +494,7 @@
     public R<LoginUser> info(@PathVariable("username") String username) {
         SysUser sysUser = userService.selectUserByUserName(username);
         if (StringUtils.isNull(sysUser)) {
-            return R.fail("用户名或密码错误");
+            return R.fail("用户名/密码错误");
         }
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(sysUser);
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
index 8532806..3c07f27 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
@@ -38,7 +38,7 @@
     /**
      * 每天的9点执行的任务
      */
-    @Scheduled(cron = "0 0 16 * * *")
+    @Scheduled(cron = "0 0 9 * * *")
 //    @Scheduled(fixedRate = 60000)
     public void taskDay(){
         try {
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
index 1efb97a..b12eb8a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
@@ -138,9 +138,7 @@
         return  access_token;
     }
 
-    public static void main(String[] args) throws Exception {
-        System.out.println(getYearAllEnergy("2025",""));
-    }
+
 
 
 }
\ No newline at end of file

--
Gitblit v1.7.1