system-clients 3.2.61-taizhou → 3.2.62-fugu

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Oct 23 09:19:48 CST 2024
-gradle.version=8.2
+#Fri Aug 15 16:59:37 CST 2025
+gradle.version=8.5

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.61-taizhou",
+  "version": "3.2.62-fugu",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/Login.vue

@@ -205,7 +205,7 @@ let saveGen = function *(self) {
     console.log(self.$login.depPrompt)
     // 弱口令验证
     //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/components/server/ModifyPw.vue

@@ -22,10 +22,10 @@
           'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
             <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
             <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 8,chinesePassword: true}'>
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
               <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
             </div>
           </div>

package/src/plugins/GetLoginInfoService.js

@@ -179,6 +179,11 @@ let loginGen = async function (name, password, cue) {
       for (let proc of Vue.$login.afterLogin) {
         await proc(Vue.$login.f)
       }
+      // 启动未操作下线计时器（30分钟）
+      if(Vue.$login.autoLoginout){
+        Vue.$login.startInactivityTimer(Vue.$login.autoLoginTimeOut)
+      }
+
       // 定时发送心跳
       if (cue) {
         setInterval(() => {
@@ -212,11 +217,17 @@ let loginGen = async function (name, password, cue) {
 }
 
 let GetLoginInfoService = {
-  SinglePageToken:{},
   // 登录后要处理的异步对象
   afterLogin: [],
   //验证码开关
   Verification: true,
+  //构建时间开关
+  versionTime: true,
+  //长时间未操作退出开关
+  autoLoginout: false,
+  autoLoginTimeOut:10*60*1000,
+  //
+  SinglePageToken : {},
   //登录信息展示开关
   depPrompt: true,
   install(Vue, options) {
@@ -236,7 +247,6 @@ let GetLoginInfoService = {
     if (cue === undefined || cue === null || cue === '') {
       cue = true
     }
-    Vue.$login.SinglePageToken = cryptJS.AESEncrypt(JSON.stringify({name,password}), "3KMKqvgwR8ULbR8Z")
     return loginGen(name, password, cue)
   },
 
@@ -527,6 +537,39 @@ let GetLoginInfoService = {
     let ds = date.split('-')
     let nextMonth = ds[1] - 0 + 1
     return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
+  },
+  /**
+   * 启动未操作强制下线计时器
+   * @param timeout 超时时间（毫秒），默认30分钟
+   */
+  startInactivityTimer(timeout) {
+    // 清除已有的定时器
+    if (this._inactivityTimer) {
+      clearTimeout(this._inactivityTimer);
+    }
+    // 事件处理函数
+    const resetTimer = () => {
+      clearTimeout(this._inactivityTimer);
+      this._inactivityTimer = setTimeout(() => {
+        // 强制下线逻辑
+        // Vue.cookie.delete('loginId');
+        Vue.$login.f = {};
+        Vue.showMessage("长时间未操作，您已被强制下线", ['confirm']).then(() => {
+          location.reload();
+        });
+      }, timeout);
+    };
+    // 需要监听的事件
+    const events = ['mousemove', 'keydown', 'mousedown', 'scroll', 'touchstart'];
+    // 只绑定一次
+    if (!this._inactivityListenerAdded) {
+      events.forEach(event => {
+        window.addEventListener(event, resetTimer, true);
+      });
+      this._inactivityListenerAdded = true;
+    }
+    // 初始化计时器
+    resetTimer();
   }
 }
 

package/src/system.js

@@ -28,18 +28,26 @@ import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
 
 // BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null} = {}) {
+export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true,autoLoginout = false, autoLoginTimeOut=10*60*1000} = {}) {
   console.log(val,filiale,showLogin)
   //验证码开关赋值
   if(val!=null){
     GetLoginInfoService.Verification=val
   }
+  //构建时间开关赋值
+  if(val!=null){
+    GetLoginInfoService.versionTime=showVersionTime
+  }
   //登录提示赋值
   GetLoginInfoService.depPrompt=showLogin
   //展示待办赋值
   GetLoginInfoService.showDaiBan=show_daiBan
   //展示异地登录
   GetLoginInfoService.showYiDi=show_yiDi
+  //自动登出
+  GetLoginInfoService.autoLoginout = autoLoginout
+  //自动登出时长（默认10分钟）
+  GetLoginInfoService.autoLoginTimeOut = autoLoginTimeOut
   // 备案信息复制
   GetLoginInfoService.BAinformation = BAinformation
   Vue.use(GetLoginInfoService)
@@ -61,7 +69,7 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, s
   //资源选择
   Vue.component('res-select', ResSelect)
   Vue.component('res-select-group', ResSelectGroup)
- //资源选择测试
+  //资源选择测试
   Vue.component('test-res-select', TestResSelect)
 
   // 参数管理(新)