Commit 8188b17e authored by 李纪文's avatar 李纪文

feat: 钉钉,微信登录文件本地化,globalConfig增加emq账户信息

parent 88a97288
Pipeline #92709 passed with stages
......@@ -117,9 +117,9 @@
"@wisdom-map/arcgismap":"^2.0.67",
"@wisdom-map/basemap":"^2.0.4",
"@wisdom-map/util":"1.2.9",
"@wisdom-utils/components": "0.1.370",
"@wisdom-utils/components": "0.1.372",
"@wisdom-utils/runtime": "0.0.51",
"@wisdom-utils/utils": "0.1.408",
"@wisdom-utils/utils": "0.1.409",
"animate.css": "^4.1.1",
"antd": "4.21.2",
"bcryptjs": "2.4.3",
......
!function (window, document) {
function d(a) {
var e, c = document.createElement("iframe"),
d = "https://login.dingtalk.com/login/qrcode.htm?goto=" + a.goto ;
d += a.style ? "&style=" + encodeURIComponent(a.style) : "",
d += a.href ? "&href=" + a.href : "",
c.src = d,
c.frameBorder = "0",
c.allowTransparency = "true",
c.scrolling = "no",
c.width = a.width ? a.width + 'px' : "365px",
c.height = a.height ? a.height + 'px' : "400px",
e = document.getElementById(a.id),
e.innerHTML = "",
e.appendChild(c)
}
window.DDLogin = d
}(window, document);
\ No newline at end of file
!function(a,b,c){function d(c){var d=b.createElement("iframe"),e="https://open.work.weixin.qq.com/wwopen/sso/qrConnect?appid="+c.appid+"&agentid="+c.agentid+"&redirect_uri="+c.redirect_uri+"&state="+c.state+"&login_type=jssdk";e+=c.style?"&style="+c.style:"",e+=c.href?"&href="+c.href:"",d.src=e,d.frameBorder="0",d.allowTransparency="true",d.scrolling="no",d.width="300px",d.height="400px";var f=b.getElementById(c.id);f.innerHTML="",f.appendChild(d),d.onload=function(){d.contentWindow.postMessage&&a.addEventListener&&(a.addEventListener("message",function(b){
b.data&&(/work\.weixin\.qq\.com$/.test(b.origin))&&(/^https?:\/\//.test(b.data))&&(a.location.href=b.data)}),d.contentWindow.postMessage("ask_usePostMessage","*"))}}a.WwLogin=d}(window,document);
\ No newline at end of file
......@@ -12,8 +12,8 @@
<link type="text/css" rel="stylesheet" id="theme-style" href="/civbase/Assets/esri/css/main.css">
<script src="/civbase/event.js"></script>
<script crossorigin src="/civbase/isomorphic-fetch.js"></script>
<script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
<script src="https://rescdn.qqmail.com/node/ww/wwopenmng/js/sso/wwLogin-1.0.0.js"></script>
<script src="/civbase/ddLogin.js"></script>
<script src="/civbase/wwLogin.js"></script>
<script type="text/javascript">
window.share = {
event: new EventEmitter(),
......
......@@ -533,6 +533,8 @@ class Login {
// eslint-disable-next-line radix
mqttConfig.mqtt_mess.TcpPort = data.TcpPort ? parseInt(data.TcpPort) : 8083;
mqttConfig.mqtt_mess.MessageLevel = data.MessageLevel ? data.MessageLevel : DEFAULT_PARSE_LEVEL;
mqttConfig.mqtt_account = data?.EmqAccount || '';
mqttConfig.mqtt_password = data?.EmqPassword || '';
if (data.NginxStart) {
mqttConfig.nginxStart = data.NginxStart;
......
......@@ -533,6 +533,8 @@ class Login {
// eslint-disable-next-line radix
mqttConfig.mqtt_mess.TcpPort = data.TcpPort ? parseInt(data.TcpPort) : 8083;
mqttConfig.mqtt_mess.MessageLevel = data.MessageLevel ? data.MessageLevel : DEFAULT_PARSE_LEVEL;
mqttConfig.mqtt_account = data?.EmqAccount || '';
mqttConfig.mqtt_password = data?.EmqPassword || '';
if (data.NginxStart) {
mqttConfig.nginxStart = data.NginxStart;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment