Merge branch 'main' into local_dev_ft

@@ -52,7 +52,7 @@ export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => {
     ...params,
     orderFiled: 'createdTime',
   };
-  return defHttp.get<PaginationResult>({
+  return defHttp.get<PaginationResult<{ default: boolean; id: { id: string } }>>({
     url: Api.getTenantProfile,
     params: param,
   });

 <script lang="ts" setup>
   import { h } from 'vue';
+  import { useI18n } from 'vue-i18n';
   import { Description, useDescription } from '/@/components/Description';
   import { BasicModal, useModal } from '/@/components/Modal';
+  import { cacheCipher } from '/@/settings/encryptionSetting';
+  import { AesEncryption } from '/@/utils/cipher';
+
+  const encryption = new AesEncryption(cacheCipher);
+
+  const { t } = useI18n();
+
+  enum FiledKey {
+    copyright = 'field1',
+    website = 'filed2',
+    authorization = 'field3',
+  }
+
+  // const handleEncode = (string: string) => {
+  //   return encryption.encryptByAES(string);
+  // };
+
+  const handleDecode = (encodeString: string) => {
+    return encryption.decryptByAES(encodeString);
+  };
 
   const [register] = useModal();
 
@@ -15,19 +36,18 @@
       paddingRight: '20px',
     },
     data: {
-      copyright:
-        'ThingsKit物联网平台版权归成都云腾五洲科技有限公司所有,您可以任意商用,但请注意保留本版权声明',
-      website: 'https://thingskit.com',
-      authorization: '若不想保留本版权声明,请前往以下链接查看移出方法,',
+      [FiledKey.copyright]: handleDecode(t('routes.aboutSoftware.copyright')),
+      [FiledKey.website]: handleDecode(t('routes.aboutSoftware.website')),
+      [FiledKey.authorization]: handleDecode(t('routes.aboutSoftware.authorization')),
     },
     schema: [
       {
-        field: 'copyright',
-        label: '版权声明',
+        field: FiledKey.copyright,
+        label: handleDecode(t('routes.aboutSoftware.copyrightLabel')),
       },
       {
-        field: 'website',
-        label: '官网',
+        field: FiledKey.website,
+        label: handleDecode(t('routes.aboutSoftware.websiteLabel')),
         render: (val: string) => {
           return h(
             'span',
@@ -37,10 +57,9 @@
         },
       },
       {
-        field: 'authorization',
-        label: '商业授权',
+        field: FiledKey.authorization,
+        label: handleDecode(t('routes.aboutSoftware.authorizationLabel')),
         render: (val: string) => {
-          console.log(val);
           // https://community.thingskit.com/question/20.html
           return h('div', {}, [
             h('span', val),
@@ -62,7 +81,7 @@
 <template>
   <BasicModal
     @register="register"
-    title="关于我们"
+    :title="handleDecode(t('routes.aboutSoftware.aboutSoftware'))"
     width="50%"
     cancel-text="关闭"
     :show-ok-btn="false"

@@ -37,7 +37,11 @@
           :text="t('layout.header.dropdownItemChangePassword')"
           icon="ant-design:unlock-twotone"
         />
-        <MenuItem key="aboutSoftware" text="关于软件" icon="ant-design:message-outline" />
+        <MenuItem
+          key="aboutSoftware"
+          :text="handleDecode(t('routes.aboutSoftware.aboutSoftware'))"
+          icon="ant-design:message-outline"
+        />
         <MenuItem
           v-if="getUseLockPage"
           key="lock"
@@ -77,6 +81,8 @@
   import { useRouter } from 'vue-router';
   import { usePermission } from '/@/hooks/web/usePermission';
   import AboutSoftwareModal from '../AboutSoftwareModal.vue';
+  import { AesEncryption } from '/@/utils/cipher';
+  import { cacheCipher } from '/@/settings/encryptionSetting';
 
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal' | 'changePassword' | 'aboutSoftware';
 
@@ -176,7 +182,13 @@
         router.push('/system/changePassword');
       };
 
+      const encryption = new AesEncryption(cacheCipher);
+      const handleDecode = (string: string) => {
+        return encryption.decryptByAES(string);
+      };
+
       return {
+        handleDecode,
         updataPersonlData,
         refreshPersonlData,
         refreshPersonalFunc,

+export default {
+  aboutSoftware: 'M2e/fueM5gOxek1+Cqh5CA==',
+  copyrightLabel: 'euVkVv2k+9lAoBFk2/IcAg==',
+  websiteLabel: 'Lg18XskCEQMA57HJp/kFSg==',
+  authorizationLabel: 'RgtDsxIoA+6FMp4Ani+utw==',
+  copyright:
+    '5ZZv6QlLvd5rrVAubQbHxCb2HrJoY+efYpnto5GHh4Diz5PVne8rb1Ao/L+kLUrgeJe5BGIepGMuyURKaDeSPURtCLInlllTNHKjGbnJOm8BZRFm2DUWcHktj20z4WgPf2eu4deeGr1S+i62lLZwj9o9Ynf30T5W500YBzFCnb65cXA7tXGG35JhOy3fe7oo',
+  website: 'GJahLAezazanWODyf7QEGjU3xfvz1GEKW0OTFhG9m+U=',
+  authorization:
+    '8knL7RPacArF00UmNK2ANxRyISIZwycI8erZvHsg+fGt9Gw0Q3SLPgRLr5o+1lzs8D2RVwfiu6ogHgf8IyZHf+4A7SdTa/DRFSBVIXBgzjQ=',
+};

+export default {
+  aboutSoftware: 'M2e/fueM5gOxek1+Cqh5CA==',
+  copyrightLabel: 'euVkVv2k+9lAoBFk2/IcAg==',
+  websiteLabel: 'Lg18XskCEQMA57HJp/kFSg==',
+  authorizationLabel: 'RgtDsxIoA+6FMp4Ani+utw==',
+  copyright:
+    '5ZZv6QlLvd5rrVAubQbHxCb2HrJoY+efYpnto5GHh4Diz5PVne8rb1Ao/L+kLUrgeJe5BGIepGMuyURKaDeSPURtCLInlllTNHKjGbnJOm8BZRFm2DUWcHktj20z4WgPf2eu4deeGr1S+i62lLZwj9o9Ynf30T5W500YBzFCnb65cXA7tXGG35JhOy3fe7oo',
+  website: 'GJahLAezazanWODyf7QEGjU3xfvz1GEKW0OTFhG9m+U=',
+  authorization:
+    '8knL7RPacArF00UmNK2ANxRyISIZwycI8erZvHsg+fGt9Gw0Q3SLPgRLr5o+1lzs8D2RVwfiu6ogHgf8IyZHf+4A7SdTa/DRFSBVIXBgzjQ=',
+};

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
+import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
 
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
@@ -116,7 +118,10 @@ export const step1Schemas: FormSchema[] = [
     label: '地址码',
     component: 'Input',
     ifShow: ({ model }) => {
-      return model['transportType'] === 'TCP';
+      return (
+        model['transportType'] === TransportTypeEnum.TCP &&
+        model['deviceType'] === DeviceTypeEnum.SENSOR
+      );
     },
     dynamicRules: ({ model }) => {
       return [{ required: model['transportType'] === 'TCP', message: '地址码为必填项' }];

@@ -362,7 +362,6 @@
 
       const generateSN = async () => {
         const data = await generateSNCode();
-        console.log(data);
         setFieldsValue({
           sn: data,
         });

@@ -130,9 +130,9 @@ export const tenantFormSchema: FormSchema[] = [
       return {
         api: async (params: QueryTenantProfilesParam) => {
           const { items, total } = await getTableTenantProfileApi(params);
-          const firstRecord = items.at(0);
-          if (firstRecord) {
-            setFieldsValue({ tenantProfileId: firstRecord.id.id });
+          const defaultRecord = items.find((item) => item.default);
+          if (defaultRecord) {
+            setFieldsValue({ tenantProfileId: defaultRecord.id.id });
           }
           return { items, total };
         },