Merge branch 'master' of https://e.coding.net/jiaolongcloud/cloudlink/cloudlink-ui

src/api/iot/sys.ts

@@ -6,7 +6,7 @@ import request from '@/service/request'
  */
 export const getSysConf = () => {
   return request<IOT.API.SYS.Sys>({
-    url: '/sysConf',
+    url: '/systemSetting',
     method: 'GET'
   })
 }
@@ -17,7 +17,7 @@ export const getSysConf = () => {
  */
 export const updateSysConf = (data: IOT.API.SYS.Sys) => {
   return request<string>({
-    url: '/sysConf',
+    url: '/systemSetting',
     method: 'PUT',
     data
   })
@@ -29,8 +29,8 @@ export const updateSysConf = (data: IOT.API.SYS.Sys) => {
  */
 export const addSysConf = (data: IOT.API.SYS.Sys) => {
   return request<string>({
-    url: '/sysConf',
-    method: 'POST',
+    url: '/systemSetting',
+    method: 'PUT',
     data
   })
 }

src/pages/Iot/sys/noticeway.vue

@@ -4,25 +4,33 @@
       <a-col span="6" >
         <a-card
           title="邮箱配置"
-
         >
         <template v-slot:extra >
-          <a-button type="primary" @click="openModal" >{{modelRef.id ? '修改邮箱' : '创建邮箱'}}</a-button>
+          <a-button type="primary" @click="openModal" >{{modelRef.tenantId ? '修改邮箱' : '创建邮箱'}}</a-button>
         </template>
           <a-row>
             <a-col  span="24" class="email" >
-            <a-form  v-if="modelRef.id" >
+            <a-form  v-if="modelRef.tenantId" >
+              <a-form-item label="MQTT 服务地址" >
+                {{ state.sys.mqttServerUrl }}
+              </a-form-item>
+              <a-form-item label="COAP 服务地址" >
+                {{ state.sys.coapServerUrl }}
+              </a-form-item>
+              <a-form-item label="HTTP 服务地址" >
+                {{ state.sys.httpServerUrl }}
+              </a-form-item>
               <a-form-item label="邮件地址📧" >
-                {{ state.sys.mailConf?.host }}
+                {{ state.sys.mailSetting?.host }}
               </a-form-item>
               <a-form-item label="邮件协议🔗" >
-                {{ state.sys.mailConf?.protocol }}
+                {{ state.sys.mailSetting?.protocol }}
               </a-form-item>
               <a-form-item label="邮件账号🔢" >
-                {{ state.sys.mailConf?.username }}
+                {{ state.sys.mailSetting?.username }}
               </a-form-item>
               <a-form-item label="邮件密码🫥" >
-                {{ state.sys.mailConf?.password }}
+                {{ state.sys.mailSetting?.password }}
               </a-form-item>
             </a-form>
 
@@ -44,7 +52,16 @@
     @cancel="state.visible = false"
     @ok="ok"
   >
-  <a-form :label-col="{span: 4}" :wrapper-col="{span: 14}">
+  <a-form :label-col="{span: 6}" :wrapper-col="{span: 14}">
+    <a-form-item label="MQTT 服务地址" v-bind="validateInfos.mqttServerUrl">
+      <a-input allowClear v-model:value="state.sys.mqttServerUrl"  />
+    </a-form-item>
+    <a-form-item label="COAP 服务地址" v-bind="validateInfos.coapServerUrl">
+      <a-input allowClear v-model:value="state.sys.coapServerUrl"  />
+    </a-form-item>
+    <a-form-item label="HTTP 服务地址" v-bind="validateInfos.httpServerUrl">
+      <a-input allowClear v-model:value="state.sys.httpServerUrl"  />
+    </a-form-item>
     <a-form-item label="邮件地址" v-bind="validateInfos.host">
       <a-input allowClear v-model:value="modelRef.host"  />
     </a-form-item>
@@ -82,7 +99,7 @@ const state = reactive<{
 const modalTitle = computed(() => modelRef.id ? '修改邮箱' : '创建邮箱')
 
 const modelRef = reactive({
-  id: '',
+  tenantId: '',
   host: '',
   port: '',
   protocol: '',
@@ -102,10 +119,10 @@ const { resetFields, validate, validateInfos } = useForm(modelRef, reactive({
 
 const ok = () => {
   validate().then(async () => {
-    if (modelRef.id) {
-      await SysController.updateSysConf({ ...state.sys, mailConf: modelRef })
+    if (modelRef.tenantId) {
+      await SysController.updateSysConf({ ...state.sys, mailSetting: modelRef })
     } else {
-      await SysController.addSysConf({ ...state.sys, mailConf: modelRef })
+      await SysController.addSysConf({ ...state.sys, mailSetting: modelRef })
     }
 
     state.visible = false
@@ -121,9 +138,13 @@ const getLogo = async () => {
   state.loading = true
   const { data } = await SysController.sysConf()
   state.loading = false
-  state.sys = data || { mailConf: {} }
-  modelRef.id = data ? data.id : ''
-  resetFields(data || { mailConf: {} })
+  console.log('data:', data)
+
+  state.sys = data || { mailSetting: {} }
+  resetFields(data.mailSetting || { mailSetting: {} })
+  modelRef.tenantId = data ? data.tenantId : ''
+
+  console.log('  modelRef.id :', modelRef)
 }
 
 onMounted(() => {

src/router/index.ts

@@ -324,7 +324,7 @@ const login = {
   meta: {
     title: '登录'
   },
-  component: () => import('@commons/pages/login/index.vue')
+  component: () => import('@/pages/login/index.vue')
 }
 
 const cvs = {

src/type/iot.d.ts

@@ -435,6 +435,9 @@ declare namespace IOT {
         'sysLabel': string,
         'sysIcon': string, // 系统图片，上传时候限制大小为3M 并且base64 编码
         'sysTheme': string,
+        mqttServerUrl: string // 'MQTT 服务地址'
+        coapServerUrl: string // 'COAP 服务地址'
+        httpServerUrl: string // 'HTTP 服务地址'
         'mailConf': {
           'host': string,
           'port': number,