diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 7b7388f..4a31e50 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -57,4 +57,16 @@ export function getCodeImg() {
method: 'get',
timeout: 20000
})
-}
\ No newline at end of file
+}
+
+// 注册方法
+export function activateLicense(query) {
+ return request({
+ url: '/license/activate',
+ headers: {
+ isToken: false
+ },
+ method: 'post',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/ruoyi-ui/src/assets/images/login-background.jpg
index 8a89eb8..86196e7 100644
Binary files a/ruoyi-ui/src/assets/images/login-background.jpg and b/ruoyi-ui/src/assets/images/login-background.jpg differ
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 7150ecb..1a02a0a 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -73,6 +73,8 @@ service.interceptors.request.use(config => {
// 响应拦截器
service.interceptors.response.use(res => {
+ const licenseWarning = res.headers['license-warning'];
+ localStorage.setItem('licenseWarning', licenseWarning);
// 未设置状态码则默认成功状态
const code = res.data.code || 200
// 获取错误信息
diff --git a/ruoyi-ui/src/views/kaohe/gather/index.vue b/ruoyi-ui/src/views/kaohe/gather/index.vue
index 58a071a..7f0257f 100644
--- a/ruoyi-ui/src/views/kaohe/gather/index.vue
+++ b/ruoyi-ui/src/views/kaohe/gather/index.vue
@@ -507,9 +507,9 @@ export default {
console.log(JSON.parse(response.data.tableData), JSON.parse(response.data.tableHeader));
let khdfList = JSON.parse(response.data.tableData);
let btTabelTree = JSON.parse(response.data.tableHeader);
- khdfList.forEach(item=> {
+ /*khdfList.forEach(item=> {
item[btTabelTree[0].name]['khdx'] = item.khdx;
- })
+ })*/
this.khdf.list = khdfList;
btTabelTree.forEach(item => {
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 5e94553..2de36f6 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -37,7 +37,14 @@
-