Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

.gitlab-ci.yml

@@ -45,6 +45,7 @@ package:
    #  - node_modules/
   only:
     - master
+  allow_failure: false
   when: manual
 
 
@@ -70,4 +71,4 @@ push:
 
   only:
     - master
-  when: manual
+  when: on_success

package.json

@@ -87,7 +87,8 @@
         "scripts/**/*.js"
     ],
     "resolutions": {
-        "babel-core": "7.0.0-bridge.0"
+        "babel-core": "7.0.0-bridge.0",
+        "webpack": "^5.70.0"
     },
     "dependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
@@ -103,7 +104,7 @@
         "@babel/runtime": "^7.10.5",
         "@esri/arcgis-html-sanitizer": "2.9.5",
         "@esri/calcite-colors": "6.0.3",
-        "@wisdom-cesium/cesium": "^1.0.83",
+        "@wisdom-cesium/cesium": "^1.0.84",
         "@wisdom-components/basictable": "^1.5.16",
         "@wisdom-components/empty": "^1.4.1",
         "@wisdom-map/amap": "^1.0.49--27.8",

src/api/service/base.js

@@ -13,9 +13,8 @@ export const API = {
   AUTHORIZATION_TOKEN: '/PandaCore/Identity/AuthorizationToken', // 授权验证，不需要走网关加前缀
   GET_GATEWAY_CONFIG: '/PandaOMS/OMS/HostManager/GetGateWay',
   GET_CONFIG: '/PandaOMS/OMS/WebSite/GetConfig',
-  GENERATE_TOKEN: '/cityinterface/rest/services.svc/generatetoken',
-  GENERATE_GATEWAT_TOKEN: '/PandaCore/GCK/Basis/GenerateToken',
-  GENERATE_IOT_TOKEN: 'cityinterface/rest/services.svc/generateGCKToken',
+  GENERATE_TOKEN: '/PandaCore/GCK/BussinessAuth/GenerateToken',
+  GENERATE_IOT_TOKEN: '/PandaCore/GCK/BussinessAuth/GenerateGCKToken',
   GENERATE_QRCODE: 'cityinterface/rest/services.svc/generatetokenByqrcode',
   GENERATE_TOKEN_CHANGE: '/cityinterface/rest/services.svc/generatetokenquick',
   GET_WEB_SITE_CONFIG: '/PandaOMS/OMS/WebSite/GetWebSiteConfig',

src/pages/user/login/template/water/index.js

@@ -17,6 +17,15 @@ import Account from '../../js/useAccount';
 import IotComponent from '../../js/useIOTComponent';
 import { defaultApp } from '../../../../../micro';
 
+const renderQRCode = props => {
+  const qrcodes = props.qrcode.split('|') || [];
+  if (qrcodes.length > 0 && qrcodes[0]) {
+    let value = qrcodes[0].replace(/{ip}/gi, props.ip || window.location.host).split('=')[1];
+    return <QRCode value={value} />;
+  }
+  return <span>手持APP下载未配置</span>;
+};
+
 const Login = forwardRef((props, _ref) => {
   const sliVerify = useRef();
   const loginFormRef = useRef();
@@ -123,6 +132,10 @@ const Login = forwardRef((props, _ref) => {
           </div>
           <div className={classNames(styles['login-block'], styles.caseHide, 'animate__animated')} ref={loginFormRef}>
             <div className={styles['login-form']}>{renderPlatform()}</div>
+            <div className={styles.loginCcode}>
+              <img src="/web4/assets/images/login/石家庄/小程序@2x.png" alt="" />
+              <div className={styles.codeBig}>{renderQRCode(props.global)}</div>
+            </div>
           </div>
         </div>
 

src/pages/user/login/template/water/index.less

@@ -50,6 +50,7 @@
     .login-block {
         width: 500px;
         margin: 60px 0 150px 0;
+        position: relative;
         .login-form {
             background-color: rgba(255, 255, 255, 0.5);
             border-radius: 4px;
@@ -95,6 +96,44 @@
                 height: 40px;
             }
         }
+        .loginCcode {
+            width: 34px;
+            height: 34px;
+            position: absolute;
+            right: -34px;
+            background: rgba(255, 255, 255, 0.7);
+            padding: 6px;
+            border-radius: 0 3px 3px 0;
+            cursor: pointer;
+            bottom: 3px;
+            &:hover {
+                display: block;
+                background: transparent;
+                img {
+                    display: none;
+                }
+                .codeBig {
+                    display: block;
+                }
+            }
+            img {
+                width: 23px;
+            }
+            .codeBig {
+                width: 128px;
+                height: 150px;
+                position: absolute;
+                bottom: 0;
+                left: 0px;
+                background: rgba(255, 255, 255, 0.7);
+                padding: 6px;
+                display: none;
+                span {
+                    font-size: 12px;
+                    opacity: 0.75;
+                }
+            }
+        }
     }
 }