From 6567790a8c5399493aedac513d5f6eaeb18ffec1 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Thu, 23 Mar 2023 11:59:55 +0800
Subject: [PATCH] 授权激活页面提示修改
---
ant-design-vue-jeecg/src/views/user/modules/SystemActivationModal.vue | 2 +-
huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/user/modules/SystemActivationModal.vue b/ant-design-vue-jeecg/src/views/user/modules/SystemActivationModal.vue
index f91d485..e9837eb 100644
--- a/ant-design-vue-jeecg/src/views/user/modules/SystemActivationModal.vue
+++ b/ant-design-vue-jeecg/src/views/user/modules/SystemActivationModal.vue
@@ -5,7 +5,7 @@
<a-tab-pane key="tab1" tab="系统激活授权"/>
</a-tabs>
<a-form-model-item>
- <a-input size="large" v-model="model.activationCode" autocomplete="false" placeholder="请输入系统激活码"/>
+ <a-input size="large" v-model="model.activationCode" autocomplete="false" placeholder="系统授权已过期，请输入系统激活码"/>
</a-form-model-item>
<a-form-item style="margin-top:24px">
<a-button size="large" type="primary" htmlType="submit" class="login-button" :loading="loginBtn" @click.stop.prevent="handleSubmit" :disabled="loginBtn">确定
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
index c8aa282..e6edb14 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
@@ -292,7 +292,7 @@ public class HuahengJwtUtil {
System.out.println("jwt.getIssuedAt():" + DateUtil.format(jwt.getIssuedAt(), DatePattern.NORM_DATETIME_PATTERN));
System.out.println("jwt.getExpiresAt():" + DateUtil.format(jwt.getExpiresAt(), DatePattern.NORM_DATETIME_PATTERN));
- System.out.println("-------------------------------------系统激活码TOKEN-------------------------------------");
+ System.out.println("-------------------------------------系统激活码-------------------------------------");
// 生成系统激活码TOKEN
SystemAuthentication systemAuthentication = new SystemAuthentication();
// 生成TOKEN必填参数
--
libgit2 0.22.2