免密登录

doc/大屏/免密登录/大屏免密登录技术方案.md

@@ -177,7 +177,7 @@ async function screenAutoLogin(apiBase) {
 - [x] `ScreenLoginService` + `ScreenLoginRsaSupport` + `ScreenLoginProperties`
 - [x] `application.yml` → `bigscreen.login.*`
 - [x] 单元测试：`ScreenLoginRsaSupportTest`、`ScreenLoginServiceTest`、`ScreenLoginControllerApiTest`
-- [ ] `ruoyi-screen` 对接自动登录（按本方案调用公钥 + 登录接口）
+- [x] `ruoyi-screen` 对接自动登录（按本方案调用公钥 + 登录接口）
 
 ---
 

ruoyi-screen/.env.development

@@ -14,3 +14,6 @@ VITE_PROXY_TARGET=http://192.168.1.6:8010
 VITE_WEATHER_APP_ID=36793262
 VITE_WEATHER_APP_SECRET=t6a6z0H8
 VITE_WEATHER_CITY=巴青
+
+# 大屏免密登录（RSA 加密 UUID，见 doc/大屏/免密登录/大屏免密登录技术方案.md）
+VITE_SCREEN_AUTO_LOGIN=true

ruoyi-screen/.env.production

@@ -15,3 +15,6 @@ VITE_WEATHER_APP_ID=36793262
 VITE_WEATHER_APP_SECRET=t6a6z0H8
 VITE_WEATHER_CITY=巴青
 
+# 大屏免密登录（生产需后端 bigscreen.login.enabled=true 且配置 RSA 密钥）
+VITE_SCREEN_AUTO_LOGIN=true
+

ruoyi-screen/package-lock.json

@@ -11,6 +11,7 @@
         "axios": "^1.16.1",
         "echarts": "^5.5.1",
         "echarts-wordcloud": "^2.1.0",
+        "jsencrypt": "^3.0.0-rc.1",
         "vue": "^3.5.13",
         "vue-router": "^4.6.4"
       },
@@ -883,6 +884,11 @@
         "node": ">= 6"
       }
     },
+    "node_modules/jsencrypt": {
+      "version": "3.0.0-rc.1",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.0.0-rc.1.tgz",
+      "integrity": "sha512-gcvGaqerlUJy1Kq6tNgPYteVEoWNemu+9hBe2CdsCIz4rVcwjoTQ72iD1W76/PRMlnkzG0yVh7nwOOMOOUfKmg=="
+    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz",
@@ -1639,6 +1645,11 @@
         "debug": "4"
       }
     },
+    "jsencrypt": {
+      "version": "3.0.0-rc.1",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.0.0-rc.1.tgz",
+      "integrity": "sha512-gcvGaqerlUJy1Kq6tNgPYteVEoWNemu+9hBe2CdsCIz4rVcwjoTQ72iD1W76/PRMlnkzG0yVh7nwOOMOOUfKmg=="
+    },
     "magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz",

ruoyi-screen/package.json

@@ -15,6 +15,7 @@
     "axios": "^1.16.1",
     "echarts": "^5.5.1",
     "echarts-wordcloud": "^2.1.0",
+    "jsencrypt": "^3.0.0-rc.1",
     "vue": "^3.5.13",
     "vue-router": "^4.6.4"
   },

ruoyi-screen/src/api/login.js

@@ -27,3 +27,22 @@ export function logout() {
     method: 'post'
   })
 }
+
+/** 大屏免密登录：获取 RSA 公钥 */
+export function getScreenPublicKey() {
+  return request({
+    url: '/bigScreen/publicKey',
+    method: 'get',
+    headers: { isToken: false }
+  })
+}
+
+/** 大屏免密登录：提交 RSA 密文换取 JWT */
+export function screenAutoLogin(encryptedToken) {
+  return request({
+    url: '/bigScreen/login',
+    method: 'post',
+    headers: { isToken: false },
+    data: { token: encryptedToken }
+  })
+}

ruoyi-screen/src/components/ScreenNavBar.vue

@@ -46,6 +46,7 @@ import { computed } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { logout } from "@/api/login";
 import { removeToken } from "@/utils/auth";
+import { resetScreenAutoLoginState } from "@/utils/screenAutoLogin";
 
 const router = useRouter();
 const route = useRoute();
@@ -101,6 +102,7 @@ function goNav(item) {
 function onLogout() {
   logout().catch(() => {});
   removeToken();
+  resetScreenAutoLoginState();
   router.replace({ path: "/login" });
 }
 </script>

ruoyi-screen/src/router/index.js

@@ -1,6 +1,7 @@
 import { createRouter, createWebHistory } from "vue-router"
 import ScreenLayout from "../layout/ScreenLayout.vue"
 import { getToken } from "../utils/auth"
+import { ensureScreenAutoLogin, isScreenAutoLoginEnabled } from "../utils/screenAutoLogin"
 
 /**
  * 大屏路由表（路径与后端 /bigScreen/* 业务对应，便于联调）
@@ -87,15 +88,35 @@ const router = createRouter({
   routes
 })
 
-/** 未登录跳转登录页；已登录访问 /login 则进首页 */
-router.beforeEach((to, _from, next) => {
+/** 未登录跳转登录页；已登录访问 /login 则进首页；启用免密时先尝试自动登录 */
+router.beforeEach(async (to, _from, next) => {
   const token = getToken()
   if (to.path === "/login") {
-    next(token ? { path: "/home" } : undefined)
+    if (token) {
+      next({ path: "/home" })
+      return
+    }
+    if (isScreenAutoLoginEnabled()) {
+      const ok = await ensureScreenAutoLogin()
+      if (ok) {
+        const redirect =
+          typeof to.query.redirect === "string" ? to.query.redirect : "/home"
+        next({ path: redirect })
+        return
+      }
+    }
+    next()
     return
   }
   const needAuth = to.matched.some((r) => r.meta.requiresAuth)
-  if (needAuth && !token) {
+  if (needAuth && !getToken()) {
+    if (isScreenAutoLoginEnabled()) {
+      const ok = await ensureScreenAutoLogin()
+      if (ok) {
+        next()
+        return
+      }
+    }
     next({ path: "/login", query: { redirect: to.fullPath } })
     return
   }

ruoyi-screen/src/utils/request.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import router from '../router'
 import { getToken, removeToken } from './auth'
+import { resetScreenAutoLoginState } from './screenAutoLogin'
 import { tansParams } from './ruoyi'
 
 /** 避免多个接口同时 401 重复跳转登录 */
@@ -11,6 +12,7 @@ function redirectToLogin() {
   if (router.currentRoute.value.path === '/login') return
   isRedirectingLogin = true
   removeToken()
+  resetScreenAutoLoginState()
   const redirect = router.currentRoute.value.fullPath
   router
     .replace({

ruoyi-screen/src/utils/screenAutoLogin.js

@@ -0,0 +1,78 @@
+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
+import { getScreenPublicKey, screenAutoLogin } from '@/api/login'
+import { getToken, setToken } from '@/utils/auth'
+
+/** 同一会话内仅尝试一次免密登录，避免反复请求 */
+let autoLoginState = null
+let autoLoginPromise = null
+
+export function isScreenAutoLoginEnabled() {
+  return import.meta.env.VITE_SCREEN_AUTO_LOGIN === 'true'
+}
+
+export function resetScreenAutoLoginState() {
+  autoLoginState = null
+  autoLoginPromise = null
+}
+
+/**
+ * RSA 加密 UUID 换取 JWT（见 doc/大屏/免密登录/大屏免密登录技术方案.md）
+ * @returns {Promise<string>} JWT
+ */
+export async function tryScreenAutoLogin() {
+  const keyRes = await getScreenPublicKey()
+  const publicKey = keyRes.data?.publicKey
+  if (!publicKey) {
+    throw new Error('未获取到 RSA 公钥')
+  }
+
+  const uuid = crypto.randomUUID()
+  const encryptor = new JSEncrypt()
+  encryptor.setPublicKey(publicKey)
+  const cipher = encryptor.encrypt(uuid)
+  if (!cipher) {
+    throw new Error('RSA 加密失败')
+  }
+
+  const loginRes = await screenAutoLogin(cipher)
+  if (!loginRes.token) {
+    throw new Error('免密登录未返回 token')
+  }
+  setToken(loginRes.token)
+  return loginRes.token
+}
+
+/**
+ * 路由守卫用：已登录直接通过；未启用免密则 false；否则尝试一次免密登录
+ * @returns {Promise<boolean>}
+ */
+export async function ensureScreenAutoLogin() {
+  if (getToken()) {
+    return true
+  }
+  if (!isScreenAutoLoginEnabled()) {
+    return false
+  }
+  if (autoLoginState === 'fail') {
+    return false
+  }
+  if (autoLoginState === 'ok') {
+    return !!getToken()
+  }
+  if (autoLoginState === 'pending' && autoLoginPromise) {
+    return autoLoginPromise
+  }
+
+  autoLoginState = 'pending'
+  autoLoginPromise = tryScreenAutoLogin()
+    .then(() => {
+      autoLoginState = 'ok'
+      return true
+    })
+    .catch(() => {
+      autoLoginState = 'fail'
+      return false
+    })
+
+  return autoLoginPromise
+}

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -6,7 +6,7 @@
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' && navType !== 3 ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' && navType !== 3 ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>
@@ -80,7 +80,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 11px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

ruoyi-ui/src/views/diseaseTreatment/medicalResource/index.vue

@@ -207,7 +207,7 @@
               :placeholder="dtT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
-              @change="validateFormField('serviceStartTime')"
+              @change="handleServiceStartTimeChange"
             />
             <span class="time-sep">{{ dtCommon("timeSeparator") }}</span>
             <el-time-select
@@ -215,7 +215,7 @@
               :placeholder="dtT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
-              @change="validateFormField('serviceStartTime')"
+              @change="handleServiceEndTimeChange"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
@@ -282,7 +282,7 @@
               :placeholder="dtT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
-              @change="validateFormField('serviceStartTime')"
+              @change="handleServiceStartTimeChange"
             />
             <span class="time-sep">{{ dtCommon("timeSeparator") }}</span>
             <el-time-select
@@ -290,7 +290,7 @@
               :placeholder="dtT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
-              @change="validateFormField('serviceStartTime')"
+              @change="handleServiceEndTimeChange"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
@@ -526,12 +526,11 @@ export default {
       return !!(this.form.photoFilePath || this.form.photoFileUrl)
     },
     timePickerOptionsEnd() {
-      const start = this.form.serviceStartTime
       return {
-        start: start || "00:00",
+        start: "00:00",
         step: "00:15",
         end: "23:45",
-        minTime: start
+        minTime: this.form.serviceStartTime || "00:00"
       }
     },
     formRules() {
@@ -831,8 +830,47 @@ export default {
     allConsultModeValues() {
       return this.consultModeOptions.map((item) => item.value)
     },
+    hasServiceScheduleType(resourceType) {
+      const t = this.normalizeResourceType(resourceType)
+      return this.isVetType(t) || this.isOrgType(t)
+    },
+    defaultServiceStartTime() {
+      return "08:00"
+    },
+    defaultServiceEndTime() {
+      return "18:00"
+    },
+    defaultServiceWeekdaysList() {
+      return [1, 2, 3, 4, 5]
+    },
+    applyDefaultServiceSchedule(resourceType) {
+      if (!this.hasServiceScheduleType(resourceType)) {
+        return
+      }
+      this.form.serviceStartTime = this.defaultServiceStartTime()
+      this.form.serviceWeekdaysList = this.defaultServiceWeekdaysList()
+      this.$nextTick(() => {
+        this.form.serviceEndTime = this.defaultServiceEndTime()
+      })
+    },
+    handleServiceStartTimeChange() {
+      const start = this.form.serviceStartTime
+      const end = this.form.serviceEndTime
+      if (start && (!end || end <= start)) {
+        this.$nextTick(() => {
+          this.form.serviceEndTime = this.defaultServiceEndTime()
+          this.validateFormField("serviceStartTime")
+        })
+        return
+      }
+      this.validateFormField("serviceStartTime")
+    },
+    handleServiceEndTimeChange() {
+      this.validateFormField("serviceStartTime")
+    },
     resetFormModel() {
       const resourceType = TAB_TYPE_MAP[this.activeTab]
+      const hasServiceSchedule = this.hasServiceScheduleType(resourceType)
       this.form = {
         id: undefined,
         resourceType,
@@ -846,9 +884,9 @@ export default {
         consultModesList: this.isVetType(resourceType) ? this.allConsultModeValues() : [],
         serviceArea: undefined,
         feeStandard: undefined,
-        serviceStartTime: undefined,
-        serviceEndTime: undefined,
-        serviceWeekdaysList: [],
+        serviceStartTime: hasServiceSchedule ? this.defaultServiceStartTime() : undefined,
+        serviceEndTime: hasServiceSchedule ? this.defaultServiceEndTime() : undefined,
+        serviceWeekdaysList: hasServiceSchedule ? this.defaultServiceWeekdaysList() : [],
         maxDailyAppointments: this.isOrgType(resourceType) ? 30 : undefined,
         establishDate: undefined,
         teamSize: undefined,
@@ -863,7 +901,14 @@ export default {
       this.resetFormModel()
       this.dialogEdit = false
       this.open = true
-      this.$nextTick(() => this.resetForm("form"))
+      this.$nextTick(() => {
+        if (this.hasServiceScheduleType(this.form.resourceType)) {
+          this.form.serviceEndTime = this.defaultServiceEndTime()
+        }
+        if (this.$refs.form) {
+          this.$refs.form.clearValidate()
+        }
+      })
     },
     fillFormFromApi(data) {
       const row = this.normalizeMedicalResourceRow(data)
@@ -988,6 +1033,8 @@ export default {
         this.form.serviceStartTime = undefined
         this.form.serviceEndTime = undefined
         this.form.serviceWeekdaysList = []
+      } else {
+        this.applyDefaultServiceSchedule(t)
       }
       if (!this.isVetType(t) && !this.isTeamType(t) && !this.isEquipmentType(t)) {
         this.form.affiliatedUnit = undefined

ruoyi-ui/src/views/techService/techResource/index.vue

@@ -271,7 +271,7 @@
               :placeholder="tsT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
-              @change="validateFormField('serviceStartTime')"
+              @change="handleServiceStartTimeChange"
             />
             <span class="time-sep">{{ tsCommon("timeSeparator") }}</span>
             <el-time-select
@@ -279,7 +279,7 @@
               :placeholder="tsT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
-              @change="validateFormField('serviceStartTime')"
+              @change="handleServiceEndTimeChange"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
@@ -329,6 +329,7 @@
               :placeholder="tsT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
+              @change="handleServiceStartTimeChange"
             />
             <span class="time-sep">{{ tsCommon("timeSeparator") }}</span>
             <el-time-select
@@ -336,11 +337,12 @@
               :placeholder="tsT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
+              @change="handleServiceEndTimeChange"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
             <template slot="label">{{ tsT("formServiceWeekdays") }}</template>
-            <el-checkbox-group v-model="form.serviceWeekdaysList">
+            <el-checkbox-group v-model="form.serviceWeekdaysList" @change="validateFormField('serviceWeekdaysList')">
               <el-checkbox v-for="item in weekdayOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -598,12 +600,11 @@ export default {
       return !!(this.form.coverFilePath || this.form.coverFileUrl)
     },
     timePickerOptionsEnd() {
-      const start = this.form.serviceStartTime
       return {
-        start: start || "00:00",
+        start: "00:00",
         step: "00:15",
         end: "23:45",
-        minTime: start
+        minTime: this.form.serviceStartTime || "00:00"
       }
     },
     formRules() {
@@ -871,9 +872,11 @@ export default {
       this.handleQuery()
     },
     resetFormModel() {
+      const resourceType = TAB_TYPE_MAP[this.activeTab]
+      const hasServiceSchedule = this.hasServiceScheduleType(resourceType)
       this.form = {
         id: undefined,
-        resourceType: TAB_TYPE_MAP[this.activeTab],
+        resourceType,
         resourceName: undefined,
         photoFileUrl: undefined,
         photoFilePath: undefined,
@@ -893,9 +896,9 @@ export default {
         serviceArea: undefined,
         feeStandard: undefined,
         borrowFee: undefined,
-        serviceStartTime: undefined,
-        serviceEndTime: undefined,
-        serviceWeekdaysList: [],
+        serviceStartTime: hasServiceSchedule ? this.defaultServiceStartTime() : undefined,
+        serviceEndTime: hasServiceSchedule ? this.defaultServiceEndTime() : undefined,
+        serviceWeekdaysList: hasServiceSchedule ? this.defaultServiceWeekdaysList() : [],
         instrumentModel: undefined,
         storageLocation: undefined,
         reservationProcess: undefined,
@@ -909,7 +912,14 @@ export default {
       this.resetFormModel()
       this.dialogEdit = false
       this.open = true
-      this.$nextTick(() => this.resetForm("form"))
+      this.$nextTick(() => {
+        if (this.hasServiceScheduleType(this.form.resourceType)) {
+          this.form.serviceEndTime = this.defaultServiceEndTime()
+        }
+        if (this.$refs.form) {
+          this.$refs.form.clearValidate()
+        }
+      })
     },
     fillFormFromApi(data) {
       this.form = {
@@ -1022,12 +1032,58 @@ export default {
         .catch(() => {})
     },
     handleFormTypeChange() {
+      const t = this.normalizeResourceType(this.form.resourceType)
+      if (this.hasServiceScheduleType(t)) {
+        this.applyDefaultServiceSchedule(t)
+      } else {
+        this.form.serviceStartTime = undefined
+        this.form.serviceEndTime = undefined
+        this.form.serviceWeekdaysList = []
+      }
       this.$nextTick(() => {
         if (this.$refs.form) {
           this.$refs.form.clearValidate()
         }
       })
     },
+    hasServiceScheduleType(resourceType) {
+      const t = this.normalizeResourceType(resourceType)
+      return this.isExpertType(t) || this.isInstrumentType(t)
+    },
+    defaultServiceStartTime() {
+      return "08:00"
+    },
+    defaultServiceEndTime() {
+      return "18:00"
+    },
+    defaultServiceWeekdaysList() {
+      return [1, 2, 3, 4, 5]
+    },
+    applyDefaultServiceSchedule(resourceType) {
+      if (!this.hasServiceScheduleType(resourceType)) {
+        return
+      }
+      this.form.serviceStartTime = this.defaultServiceStartTime()
+      this.form.serviceWeekdaysList = this.defaultServiceWeekdaysList()
+      this.$nextTick(() => {
+        this.form.serviceEndTime = this.defaultServiceEndTime()
+      })
+    },
+    handleServiceStartTimeChange() {
+      const start = this.form.serviceStartTime
+      const end = this.form.serviceEndTime
+      if (start && (!end || end <= start)) {
+        this.$nextTick(() => {
+          this.form.serviceEndTime = this.defaultServiceEndTime()
+          this.validateFormField("serviceStartTime")
+        })
+        return
+      }
+      this.validateFormField("serviceStartTime")
+    },
+    handleServiceEndTimeChange() {
+      this.validateFormField("serviceStartTime")
+    },
     extOf(fileName) {
       if (!fileName || fileName.lastIndexOf(".") < 0) {
         return ""