From 5154a08a0e44413ec4bf873b65552746faa354ed Mon Sep 17 00:00:00 2001
From: jlzhou <12020042@qq.com>
Date: Wed, 12 Feb 2025 09:54:18 +0800
Subject: [PATCH] update .

---
 admin-ui/src/views/login.vue                  |  1 +
 bi-ui/src/router/index.js                     |  4 +--
 .../controller/system/SysLoginController.java | 32 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/views/login.vue b/admin-ui/src/views/login.vue
index 5915e22..0b52a2e 100644
--- a/admin-ui/src/views/login.vue
+++ b/admin-ui/src/views/login.vue
@@ -22,6 +22,7 @@
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
+        <div style="text-align: right; position: absolute; top: 0; right: 1rem;"><el-link :underline="false" type="primary" href="/bi/">展示大屏</el-link></div>
         <div class="copy">{{ copy }} </div>
       </div>
     </div>
diff --git a/bi-ui/src/router/index.js b/bi-ui/src/router/index.js
index ca1bdbf..242fd6d 100644
--- a/bi-ui/src/router/index.js
+++ b/bi-ui/src/router/index.js
@@ -102,8 +102,8 @@ const autoLogin = async () => {
         return;
     }
     if (!store.user.username) {
-        store.user.username = import.meta.env.VITE_APP_USERNAME;
-        store.user.password = 'YDEDgImeKAtXWOsSdMqNP/v97cDB2/lZgU0mh4T6OIPMT+D2GWVy5bw9eX8ipTUBiGaNXF/5MAxSfJSZH4KMpZO+W6E4NaOY3SlngWyR5HeIaN9rnGQHXFyez9OY1XD16ostoB2/tH/sAQq8GRVEwYSkbzGYfVIX5caBkoctN6k=';
+        store.user.username = import.meta.env.VITE_DEFAULT_USER;
+        store.user.password = import.meta.env.VITE_DEFAULT_PASSWORD;
     }
     let r = await doLogin(store.user.username, store.user.password);
     console.debug('r',r);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index e58de65..ffd2f43 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -4,9 +4,12 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import com.ruoyi.common.annotation.Dev;
+import com.ruoyi.common.annotation.IgnoreResponse;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RSAProperties;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -25,6 +28,7 @@ import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.SysLoginService;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.validation.annotation.Validated;
@@ -69,6 +73,34 @@ public class SysLoginController {
         return R.map().put(Constants.TOKEN, token);
     }
 
+  @Data
+  public static class EmqxLoginBody {
+    private String username;
+    private String password;
+
+  }
+
+  @SaIgnore
+  @IgnoreResponse
+  @PostMapping("/emqx-login")
+  public Object emqxLogin(@RequestBody EmqxLoginBody loginBody) {
+    Map<String,Object> ret = MapUtil.newHashMap();
+    ret.put("is_superuser",false);
+    ret.put("result","deny");
+    if(loginBody.getUsername().equals("energy2") && loginBody.getPassword().equals("energy21415926")){
+      ret.put("is_superuser",true);
+      ret.put("result","allow");
+      return ret;
+    }
+    try{
+      loginService.login(loginBody.getUsername(), loginBody.getPassword());
+      StpUtil.checkRoleOr("admin","mqtt");
+      ret.put("is_superuser",true);
+      ret.put("result","allow");
+    }catch (Exception e){
+    }
+    return ret;
+  }
   /**
    * 登录
    * @param username 用户名