master
管理员 10 months ago
parent 4a7a2b7d15
commit 5154a08a0e

@ -22,6 +22,7 @@
<span v-if="!loading"> </span> <span v-if="!loading"> </span>
<span v-else> ...</span> <span v-else> ...</span>
</el-button> </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 class="copy">{{ copy }} </div>
</div> </div>
</div> </div>

@ -102,8 +102,8 @@ const autoLogin = async () => {
return; return;
} }
if (!store.user.username) { if (!store.user.username) {
store.user.username = import.meta.env.VITE_APP_USERNAME; store.user.username = import.meta.env.VITE_DEFAULT_USER;
store.user.password = 'YDEDgImeKAtXWOsSdMqNP/v97cDB2/lZgU0mh4T6OIPMT+D2GWVy5bw9eX8ipTUBiGaNXF/5MAxSfJSZH4KMpZO+W6E4NaOY3SlngWyR5HeIaN9rnGQHXFyez9OY1XD16ostoB2/tH/sAQq8GRVEwYSkbzGYfVIX5caBkoctN6k='; store.user.password = import.meta.env.VITE_DEFAULT_PASSWORD;
} }
let r = await doLogin(store.user.username, store.user.password); let r = await doLogin(store.user.username, store.user.password);
console.debug('r',r); console.debug('r',r);

@ -4,9 +4,12 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.util.WxMaConfigHolder; import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
import cn.dev33.satoken.annotation.SaIgnore; 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.core.util.StrUtil;
import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.KeyType;
import com.ruoyi.common.annotation.Dev; import com.ruoyi.common.annotation.Dev;
import com.ruoyi.common.annotation.IgnoreResponse;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RSAProperties; import com.ruoyi.common.config.RSAProperties;
import com.ruoyi.common.config.RuoYiConfig; 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.ISysMenuService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService; import com.ruoyi.system.service.SysLoginService;
import lombok.Data;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -69,6 +73,34 @@ public class SysLoginController {
return R.map().put(Constants.TOKEN, token); 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 * @param username

Loading…
Cancel
Save