aldehyde 0.2.478 → 0.2.480

package/src/aldehyde/login/login.tsx

@@ -1,13 +1,13 @@
-import React, {CSSProperties} from "react";
+import React, { CSSProperties } from "react";
 import "./index.css";
-import {Button, Col, Form, Input, Row, FormInstance} from "antd";
+import { Button, Col, Form, Input, Row, FormInstance } from "antd";
 import {
     LockOutlined,
     SafetyCertificateOutlined,
     UserOutlined,
 } from "@ant-design/icons";
 import HCserviceV3 from "../tmpl/hcservice-v3";
-import {LocaleContext} from "../locale/LocaleProvider";
+import { LocaleContext } from "../locale/LocaleProvider";
 import Vertify from "./vertify/index";
 import Units from "../units";
 import ResetPassword from "../layout/menu/reset-password";
@@ -17,6 +17,7 @@ interface LoginProps {
     title?: any;
     programCode?: string;
     autoSaveUser?: boolean;
+    applicationCode?: string;
 }
 
 interface LoginState {
@@ -44,12 +45,13 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
     context: React.ContextType<typeof LocaleContext>;
 
     componentDidMount = async () => {
-        const {programCode} = this.props;
+        const { programCode, applicationCode } = this.props;
         localStorage.setItem("version", "v1");
 
         if (programCode) Units.setProgramCode(programCode);
+        if (applicationCode) Units.setApplicationCode(applicationCode);
         window.removeEventListener("keydown", this.handleKeyDown);
-        let pubkey = await HCserviceV3.getRasPubkey(null, programCode);
+        let pubkey = await HCserviceV3.getRasPubkey(null, programCode, applicationCode);
         this.setState({
             pubkey,
             loading: false,
@@ -57,8 +59,8 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
     };
 
     getKaptchaToken = async () => {
-        const {programCode} = this.props;
-        let res = await HCserviceV3.getKaptchaToken(programCode);
+        const { programCode, applicationCode } = this.props;
+        let res = await HCserviceV3.getKaptchaToken(programCode, applicationCode);
         if (res) {
             let kaptchaImg;
             if (res.img && res.img.indexOf("data:") == 0) {
@@ -78,7 +80,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
         this.setState({
             loading: true,
         });
-        let {kaptchaToken, pubkey, needKaptcha, vertify} = this.state;
+        let { kaptchaToken, pubkey, needKaptcha, vertify } = this.state;
 
         await this.formRef.current
             .validateFields()
@@ -86,19 +88,20 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
                 // if (needKaptcha && !vertify)
                 //   return this.setState({ showSlideVertify: false });
 
-                const {programCode} = this.props;
-                let json = {username: values.username, password: values.password};
+                const { programCode, applicationCode } = this.props;
+                let json = { username: values.username, password: values.password };
                 let res = await HCserviceV3.login(
                     json,
                     kaptchaToken,
                     values.kaptchaText,
                     pubkey,
-                    programCode
+                    programCode,
+                    applicationCode
                 );
                 if (res.status === "success") {
                     this.props.onFinish(res.token);
                 } else if (res.status === "error") {
-                    this.setState({needKaptcha: true, vertify: false});
+                    this.setState({ needKaptcha: true, vertify: false });
                     await this.getKaptchaToken();
                 }
             })
@@ -126,118 +129,118 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
     };
 
     render() {
-        const {loading, needKaptcha, kaptchaImg, showSlideVertify} = this.state;
+        const { loading, needKaptcha, kaptchaImg, showSlideVertify } = this.state;
 
-        const {autoSaveUser = true} = this.props;
+        const { autoSaveUser = true } = this.props;
 
-        const {translate} = this.context;
+        const { translate } = this.context;
         return (
             <>
-                    <Form
-                        style={{width: 350}}
-                        ref={this.formRef}
-                        name="normal_login"
-                        initialValues={{remember: true}}
+                <Form
+                    style={{ width: 350 }}
+                    ref={this.formRef}
+                    name="normal_login"
+                    initialValues={{ remember: true }}
+                >
+                    {this.props.title}
+                    <Form.Item
+                        name="username"
+                        rules={[
+                            { required: true, message: translate("${请输入}${用户名}!") },
+                            {
+                                max: 30,
+                                min: 0,
+                                message: translate("${请输入}${0-30个字符}!"),
+                            },
+                        ]}
                     >
-                        {this.props.title}
-                        <Form.Item
-                            name="username"
-                            rules={[
-                                {required: true, message: translate("${请输入}${用户名}!")},
-                                {
-                                    max: 30,
-                                    min: 0,
-                                    message: translate("${请输入}${0-30个字符}!"),
-                                },
-                            ]}
-                        >
-                            <Input
-                                prefix={<UserOutlined className="site-form-item-icon"/>}
-                                placeholder={translate("${用户名}")}
-                                autoComplete={autoSaveUser ? "on" : "off"}
-                            />
-                        </Form.Item>
-                        <Form.Item
-                            name="password"
-                            rules={[
-                                {required: true, message: translate("${请输入}${密码}!")},
-                            ]}
+                        <Input
+                            prefix={<UserOutlined className="site-form-item-icon" />}
+                            placeholder={translate("${用户名}")}
+                            autoComplete={autoSaveUser ? "on" : "off"}
+                        />
+                    </Form.Item>
+                    <Form.Item
+                        name="password"
+                        rules={[
+                            { required: true, message: translate("${请输入}${密码}!") },
+                        ]}
+                    >
+                        <Input
+                            style={
+                                autoSaveUser
+                                    ? {}
+                                    : ({ "-webkit-text-security": "disc" } as CSSProperties)
+                            }
+                            type={autoSaveUser ? "password" : "text"}
+                            placeholder={translate("${密码}")}
+                            onKeyDown={this.handleKeyDown}
+                            autoComplete={autoSaveUser ? "on" : "off"}
+                            prefix={<LockOutlined className="site-form-item-icon" />}
+                        />
+                    </Form.Item>
+                    {needKaptcha ? (
+                        <Row gutter={8}>
+                            <Col span={12}>
+                                <Form.Item
+                                    name="kaptchaText"
+                                    rules={[
+                                        {
+                                            required: true,
+                                            message: translate("${请输入}${验证码}!"),
+                                        },
+                                    ]}
+                                >
+                                    <Input
+                                        prefix={
+                                            <SafetyCertificateOutlined className="site-form-item-icon" />
+                                        }
+                                        placeholder={translate("${验证码}")}
+                                        onKeyDown={this.handleKeyDown}
+                                    />
+                                </Form.Item>
+                            </Col>
+                            <Col span={12}>
+                                <img
+                                    style={{ cursor: "pointer" }}
+                                    height={30}
+                                    width={90}
+                                    title={translate("${点击刷新}")}
+                                    onClick={this.changeKaptcha}
+                                    src={kaptchaImg}
+                                ></img>
+                            </Col>
+                        </Row>
+                    ) : (
+                        ""
+                    )}
+                    <Form.Item>
+                        <Button
+                            type="primary"
+                            style={{ width: "100%" }}
+                            loading={loading}
+                            onClick={this.handleSubmit}
                         >
-                            <Input
-                                style={
-                                    autoSaveUser
-                                        ? {}
-                                        : ({"-webkit-text-security": "disc"} as CSSProperties)
-                                }
-                                type={autoSaveUser ? "password" : "text"}
-                                placeholder={translate("${密码}")}
-                                onKeyDown={this.handleKeyDown}
-                                autoComplete={autoSaveUser ? "on" : "off"}
-                                prefix={<LockOutlined className="site-form-item-icon"/>}
-                            />
-                        </Form.Item>
-                        {needKaptcha ? (
-                            <Row gutter={8}>
-                                <Col span={12}>
-                                    <Form.Item
-                                        name="kaptchaText"
-                                        rules={[
-                                            {
-                                                required: true,
-                                                message: translate("${请输入}${验证码}!"),
-                                            },
-                                        ]}
-                                    >
-                                        <Input
-                                            prefix={
-                                                <SafetyCertificateOutlined className="site-form-item-icon"/>
-                                            }
-                                            placeholder={translate("${验证码}")}
-                                            onKeyDown={this.handleKeyDown}
-                                        />
-                                    </Form.Item>
-                                </Col>
-                                <Col span={12}>
-                                    <img
-                                        style={{cursor: "pointer"}}
-                                        height={30}
-                                        width={90}
-                                        title={translate("${点击刷新}")}
-                                        onClick={this.changeKaptcha}
-                                        src={kaptchaImg}
-                                    ></img>
-                                </Col>
-                            </Row>
-                        ) : (
-                            ""
-                        )}
-                        <Form.Item>
-                            <Button
-                                type="primary"
-                                style={{width: "100%"}}
-                                loading={loading}
-                                onClick={this.handleSubmit}
-                            >
-                                {translate("${登录}")}
-                            </Button>
-                        </Form.Item>
-                        <Form.Item style={{marginBottom:0}}>
-                            <Row gutter={8}>
-                                <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
-                            </Row>
-                        </Form.Item>
-                    </Form>
+                            {translate("${登录}")}
+                        </Button>
+                    </Form.Item>
+                    <Form.Item style={{ marginBottom: 0 }}>
+                        <Row gutter={8}>
+                            <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
+                        </Row>
+                    </Form.Item>
+                </Form>
 
                 {showSlideVertify ? (
-                    <div style={{width: "100%", height: "100%", background: "white"}}>
+                    <div style={{ width: "100%", height: "100%", background: "white" }}>
                         <Vertify
                             onSuccess={() =>
-                                this.setState({vertify: true, showSlideVertify: false}, () =>
+                                this.setState({ vertify: true, showSlideVertify: false }, () =>
                                     this.handleSubmit()
                                 )
                             }
                             onFail={() =>
-                                this.setState({vertify: false, showSlideVertify: true})
+                                this.setState({ vertify: false, showSlideVertify: true })
                             }
                         ></Vertify>
                     </div>

package/src/aldehyde/login2/login.tsx

@@ -15,6 +15,7 @@ type LoginPropType = {
   autoSaveUser?: boolean;
   version?: string;
   style?: { [key: string]: any };
+  applicationCode?: string;
 };
 
 type FormType = {
@@ -41,11 +42,14 @@ const Login = (props: LoginPropType) => {
     localStorage.setItem("version", version);
   }, []);
 
-  const { programCode: routeProgramCode } = useParams();
+  const { programCode: routeProgramCode, applicationCode: routeApplicationCode } = useParams();
+
+
   useEffect(() => {
-    if (routeProgramCode === undefined) return;
-    Units.setProgramCode(routeProgramCode);
-  }, [routeProgramCode]);
+    if (routeProgramCode) Units.setProgramCode(routeProgramCode);
+    if (routeApplicationCode) Units.setApplicationCode(routeApplicationCode);
+  }, [routeProgramCode, routeApplicationCode]);
+
   const [loading, setLoading] = useState<boolean>(false);
   const [needKaptcha, setNeedKaptcha] = useState<boolean>(false);
   const [kaptchaImg, setKaptchaImg] = useState<string>(null);
@@ -59,17 +63,19 @@ const Login = (props: LoginPropType) => {
       const { username, password, kaptchaText } = await form.validateFields();
 
       setLoading(true);
-      const { programCode, onFinish } = props;
+      const { programCode, applicationCode, onFinish } = props;
       const pubkey = await HCserviceV3.getRasPubkey(
         null,
-        programCode ? programCode : routeProgramCode
+        programCode || routeProgramCode,
+        applicationCode || routeApplicationCode
       );
       const res = await HCserviceV3.login(
         { username, password },
         kaptchaToken,
         kaptchaText,
         pubkey,
-        programCode ? programCode : routeProgramCode
+        programCode || routeProgramCode,
+        applicationCode || routeApplicationCode
       );
       if (res.status === "success") {
         onFinish(res.token);
@@ -96,7 +102,7 @@ const Login = (props: LoginPropType) => {
 
   const getKaptchaToken = async () => {
 
-    let res = await HCserviceV3.getKaptchaToken(routeProgramCode);
+    let res = await HCserviceV3.getKaptchaToken(routeProgramCode, routeApplicationCode);
     if (res) {
       let kaptchaImg;
       if (res.img && res.img.indexOf("data:") == 0) {

package/src/aldehyde/lowcode-components/base-button/index.tsx

@@ -21,7 +21,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/base-image/index.tsx

@@ -16,7 +16,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/base-map/index.tsx

@@ -19,7 +19,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/base-tabs/index.tsx

@@ -21,7 +21,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/carousel/index.tsx

@@ -27,7 +27,7 @@ const handleLocalImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx

@@ -19,7 +19,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/effectScatter-map-3d/index.tsx

@@ -19,7 +19,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -28,7 +28,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/radar-chart/index.tsx

@@ -255,7 +255,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         const { grid, legend, tooltip, color, lineStyle, isArea, areaStyle, shape, splitAreaColor, axisName, axisLineColor, splitLineColor } = config;
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
-        const temData = isDesignMode ? option.series : data;
+        const temData = isDesignMode && !data?.length ? option.series : data;
         const temMax = Math.max(...data.map(r => r.data?.map(item => item[1]) || []).flat());
         const temIndicator = data?.[0]?.data?.map(r => ({ name: r[0], max: temMax }));
         option.shape = shape;
@@ -264,7 +264,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.tooltip = tooltip ? {} : undefined;
         option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
-        option.radar = isDesignMode ? option.radar : {
+        option.radar = isDesignMode && !data?.length ? option.radar : {
             ...option.radar,
             splitArea: {
                 areaStyle: {
@@ -288,7 +288,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             },
             indicator: temIndicator
         };
-        option.series = temData.map((r, index) => ({
+        option.series = isDesignMode && !data?.length ? option.series : temData.map((r, index) => ({
             name: r.name,
             type: "radar",
             lineStyle: { ...lineStyle, color: color[index] },

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -221,7 +221,7 @@ export default class DtmplEditCard extends React.PureComponent<
         setTimeout(() => this.onValuesChange(), 300);
     };
 
-    // 表单关联项secondCriteria处理start
+    // 表单关联项secondCriterion处理start
     getSubDtmplData = async (valueField, code) => {
         const { serverKey } = this.props;
         const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
@@ -242,7 +242,7 @@ export default class DtmplEditCard extends React.PureComponent<
             if (relValueField.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField, relValueData);
             }
-            field.baseCriteria = { ...(baseCriteria || {}), "secondCriteria": relValueData };
+            field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
             field.configChanged = true;
         }
         if (relValueField3 && temForm) {
@@ -250,12 +250,12 @@ export default class DtmplEditCard extends React.PureComponent<
             if (relValueField3.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField3, relValueData);
             }
-            field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriteria": relValueData };
+            field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
             field.configChanged = true;
         }
         return field;
     }
-    // 表单关联项secondCriteria处理end
+    // 表单关联项secondCriterion处理end
 
     /**
      * 处理表单关联项

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -164,7 +164,7 @@ export default class DtmplEditPage extends React.PureComponent<
     });
   };
 
-  // 表单关联项secondCriteria处理start
+  // 表单关联项secondCriterion处理start
   getSubDtmplData = async (valueField, code) => {
     const { serverKey } = this.props;
     const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
@@ -185,7 +185,7 @@ export default class DtmplEditPage extends React.PureComponent<
       if (relValueField.subRelValueField && relValueData) {
         relValueData = await this.getSubDtmplData(relValueField, relValueData);
       }
-      field.baseCriteria = { ...(baseCriteria || {}), "secondCriteria": relValueData };
+      field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
       field.configChanged = true;
     }
     if (relValueField3 && temForm) {
@@ -193,12 +193,12 @@ export default class DtmplEditPage extends React.PureComponent<
       if (relValueField3.subRelValueField && relValueData) {
         relValueData = await this.getSubDtmplData(relValueField3, relValueData);
       }
-      field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriteria": relValueData };
+      field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
       field.configChanged = true;
     }
     return field;
   }
-  // 表单关联项secondCriteria处理end
+  // 表单关联项secondCriterion处理end
 
   loadData = async (dtmplConfig: DtmplConfig) => {
     const {
@@ -283,6 +283,9 @@ export default class DtmplEditPage extends React.PureComponent<
    * 匹配关联项的字段，实现值更新关联字段值变化
    */
   handleRelValueField = (dtmplConfig: DtmplConfig) => {
+    if(!dtmplConfig){
+      return;
+    }
     const { groups } = dtmplConfig;
     const valueFieldMap = groups.reduce((total, item) => {
       if (item.fields) {

package/src/aldehyde/sso-Login/index.tsx

@@ -22,13 +22,14 @@ const Index = (props: Props) => {
         const programCode = temParams.get("programCode");
         const token = temParams.get("token");
         const sourceId = temParams.get("sourceId");
-        return { username, ssoToken, programCode, token, sourceId };
+        const applicationCode = temParams.get("applicationCode");
+        return { username, ssoToken, programCode, token, sourceId, applicationCode };
     }, [search]);
 
     const ssoTokenLogin = async () => {
         setLoading(true);
-        const { username, ssoToken, programCode, sourceId } = params;
-        const res = await HCserviceV3.ssoTokenLogin({ username, ssoToken }, programCode, serverKey);
+        const { username, ssoToken, programCode, sourceId, applicationCode } = params;
+        const res = await HCserviceV3.ssoTokenLogin({ username, ssoToken }, programCode, applicationCode, serverKey);
         const { defaultStyleTheme } = await ProgramConfig.getThemeConfig() || {};
         if (res.status === "success") {
             HCDataSource.clear();

package/src/aldehyde/sso-Login/service/index.js

@@ -5,9 +5,10 @@ const Password = "";
 const SourceId = ""; // 菜单SourceId
 const Path = "";
 const ProgramCode = "";
+const ApplicationCode = "";
 
 export const getUrl = async () => {
-    const token = await handleLogin({ path: Path, username: Username, password: Password, programCode: ProgramCode });
+    const token = await handleLogin({ path: Path, username: Username, password: Password, programCode: ProgramCode, applicationCode: ApplicationCode });
     if (!token) {
         return null;
     }

package/src/aldehyde/sso-Login/service/login.js

@@ -3,7 +3,7 @@ import JSEncrypt from 'jsencrypt';
 import superagent from "superagent";
 
 export const handleLogin = async (params) => {
-    const { username, password, programCode, path } = params || {};
+    const { username, password, programCode, path, applicationCode } = params || {};
     if (!username || !password || !programCode || !path) {
         return null;
     }
@@ -11,7 +11,7 @@ export const handleLogin = async (params) => {
     if (!pubkey) {
         return null;
     }
-    const res = await login({ loginData: { username, password }, pubkey, programCode, path });
+    const res = await login({ loginData: { username, password }, pubkey, programCode, path, applicationCode });
     if (res.status === "success") {
         return res.token;
     } else {
@@ -21,11 +21,11 @@ export const handleLogin = async (params) => {
 }
 
 const getPubkey = async (params) => {
-    const { programCode, path } = params || {};
+    const { programCode, path, applicationCode } = params || {};
     if (!programCode) {
         return null;
     }
-    const res = await request({ url: "/v3/auth/ras-pubkey", programCode, method: "GET", path });
+    const res = await request({ url: "/v3/auth/ras-pubkey", programCode, applicationCode, method: "GET", path });
     return res?.status === "success" ? res.rasPubkey : null;
 };
 
@@ -36,19 +36,20 @@ const rsaEncrypt = (word, keyStr) => {
 }
 
 const login = async (params) => {
-    const { loginData, pubkey, programCode, serverKey, path } = params;
+    const { loginData, pubkey, programCode, applicationCode, serverKey, path } = params;
     let datetime = dayjs(new Date()).tz("Europe/London").format("YYYY-MM-DD HH:mm:ss");
     let userInfo = rsaEncrypt(JSON.stringify({ ...loginData, datetime }), pubkey);
-    let res = await request({ url: "/v3/auth/hctoken", serverKey, programCode, query: { userInfo }, method: "GET", path });
+    let res = await request({ url: "/v3/auth/hctoken", serverKey, programCode, applicationCode, query: { userInfo }, method: "GET", path });
     return { status: res.status, token: res.token };
 }
 
 const request = (params) => {
-    const { programCode, method, path, query, data, url } = params;
+    const { programCode, method, path, query, data, url, applicationCode } = params;
     return new Promise((resolve, reject) => {
         superagent(method || "POST", path + url)
             .type("form")
             .set("hydrocarbon-program-token", programCode)
+            .set("hydrocarbon-application-token", applicationCode)
             .query(query || "")
             .send(data)
             .end((req, res) => {