From b1a686b7ffecbf62853fa0912b7143f07428adf8 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期三, 19 十一月 2025 15:56:07 +0800
Subject: [PATCH] 调整代码，正常启动2
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 6 +--
fzzy-igdss-web/src/main/resources/templates/main_v2.html | 2
fzzy-igdss-web/src/main/resources/templates/register.html | 4 +-
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 4 +-
fzzy-igdss-web/src/main/resources/templates/main.html | 2
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 10 ++--
/dev/null | 40 --------------------
fzzy-igdss-web/src/main/resources/templates/login.html | 2
fzzy-igdss-web/src/main/resources/templates/main_v1.html | 2
fzzy-igdss-web/src/main/resources/templates/index.html | 4 +-
fzzy-igdss-web/src/main/resources/templates/login_new.html | 4 -
fzzy-igdss-web/src/main/resources/templates/main_v3.html | 2
fzzy-igdss-web/src/main/resources/application.yml | 2
fzzy-igdss-web/src/main/resources/templates/lock.html | 2
14 files changed, 21 insertions(+), 65 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java
deleted file mode 100644
index 8413206..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.fzzy.igds.data;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * @author: vince
- * @description: 绯荤粺涓厤缃枃浠朵腑閰嶇疆绯荤粺鍙傛暟
- **/
-@Component
-@Data
-public class ConfigData {
-
- @Value("${spring.profiles.active}")
- private String active;
-
-
- @Value("${framework.profile}")
- private String profile;
-
- @Value("${framework.companyId}")
- private String defaultCompanyId;
-
- @Value("${framework.support}")
- private String support;
-
- @Value("${framework.email}")
- private String email;
-
- @Value("${framework.phone}")
- private String phone;
-
- @Value("${framework.website}")
- private String website;
-
- @Value("${framework.address}")
- private String address;
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index b4f16db..6c4f54f 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -1,9 +1,8 @@
package com.fzzy.eoms.utils;
-import com.fzzy.igds.data.ConfigData;
+import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.ShiroUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -135,8 +134,7 @@
if (null != user) {
return user.getCompanyId();
} else {
- ConfigData configData = SpringUtils.getBean(ConfigData.class);
- return configData.getDefaultCompanyId();
+ return FrameworkConfig.getCompanyId();
}
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
index 6c2ca3e..fbfabc2 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -14,11 +14,11 @@
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -28,15 +28,14 @@
/**
* 棣栭〉 涓氬姟澶勭悊
*
- * @author ruoyi
*/
@Controller
public class SysIndexController extends BaseController {
- @Autowired
+ @Resource
private ISysMenuService menuService;
- @Autowired
+ @Resource
private ISysConfigService configService;
- @Autowired
+ @Resource
private SysPasswordService passwordService;
// 绯荤粺棣栭〉
@@ -46,6 +45,7 @@
// 鍙栬韩浠戒俊鎭�
SysUser user = getSysUser();
mmap.put("user", user);
+ mmap.put("sysName", FrameworkConfig.getName());
// 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟
List<SysMenu> menus = menuService.selectMenusByUser(user);
diff --git a/fzzy-igdss-web/src/main/resources/application.yml b/fzzy-igdss-web/src/main/resources/application.yml
index 40920bc..f5d305f 100644
--- a/fzzy-igdss-web/src/main/resources/application.yml
+++ b/fzzy-igdss-web/src/main/resources/application.yml
@@ -81,7 +81,7 @@
framework:
companyId: "1000"
# 鍚嶇О
- name: fzzy-igdss
+ name: 鏅烘収绮簱鐩戠绯荤粺
# 鐗堟湰
version: v2.0.0
# 鐗堟潈骞翠唤
diff --git a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
index 1d99615..2332bcf 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title>璁惧鍔ㄦ�佹劅鐭ヨ繍缁寸鐞嗙郴缁�</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<!-- 閬垮厤IE浣跨敤鍏煎妯″紡 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -27,7 +27,7 @@
</div>
<a th:href="@{/index}">
<li class="logo hidden-xs">
- <span class="logo-lg">璁惧鍔ㄦ�佹劅鐭ヨ繍缁寸鐞嗙郴缁�</span>
+ <span class="logo-lg" th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</span>
</li>
</a>
<div class="sidebar-collapse tab-content" id="side-menu">
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index e346145..a81729f 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title>鏅烘収绮簱-璁惧鍔ㄦ�佹劅鐭ヨ繍缁寸鐞嗙郴缁�</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<!-- 閬垮厤IE浣跨敤鍏煎妯″紡 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -27,7 +27,7 @@
</div>
<a th:href="@{/index}">
<li class="logo hidden-xs">
- <span class="logo-lg">璁惧鍔ㄦ�佹劅鐭ヨ繍缁寸鐞嗙郴缁�</span>
+ <span class="logo-lg" th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</span>
</li>
</a>
<div class="sidebar-collapse">
diff --git a/fzzy-igdss-web/src/main/resources/templates/lock.html b/fzzy-igdss-web/src/main/resources/templates/lock.html
index 2ec1a00..9aeb8af 100644
--- a/fzzy-igdss-web/src/main/resources/templates/lock.html
+++ b/fzzy-igdss-web/src/main/resources/templates/lock.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--360娴忚鍣ㄤ紭鍏堜互webkit鍐呮牳瑙ｆ瀽-->
- <title>閿佸畾灞忓箷</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
diff --git a/fzzy-igdss-web/src/main/resources/templates/login.html b/fzzy-igdss-web/src/main/resources/templates/login.html
index fb9b79d..75a6a85 100644
--- a/fzzy-igdss-web/src/main/resources/templates/login.html
+++ b/fzzy-igdss-web/src/main/resources/templates/login.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
- <title>鐧诲綍鑻ヤ緷绯荤粺</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<meta name="description" content="鑻ヤ緷鍚庡彴绠＄悊妗嗘灦">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
diff --git a/fzzy-igdss-web/src/main/resources/templates/login_new.html b/fzzy-igdss-web/src/main/resources/templates/login_new.html
index 4ed2513..e369779 100644
--- a/fzzy-igdss-web/src/main/resources/templates/login_new.html
+++ b/fzzy-igdss-web/src/main/resources/templates/login_new.html
@@ -10,9 +10,7 @@
<meta name="viewport" content="user-scalable=no, width=device-width" />
<meta content="telephone=no" name="format-detection" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鏅烘収绮簱绠＄悊绯荤粺-鐧诲綍</title>
- <meta name="description" content="鏅烘収绮簱绠＄悊绯荤粺-鐧诲綍">
- <meta name="keywords" content="鏅烘収绮簱绠＄悊绯荤粺-鐧诲綍">
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<link href="../static/axui/css/ax.css" th:href="@{/axui/css/ax.css}" rel="stylesheet"/>
<link href="../static/axui/css/ax-response.css" th:href="@{/axui/css/ax-response.css}" rel="stylesheet"/>
diff --git a/fzzy-igdss-web/src/main/resources/templates/main.html b/fzzy-igdss-web/src/main/resources/templates/main.html
index f5eaaee..8552dd9 100644
--- a/fzzy-igdss-web/src/main/resources/templates/main.html
+++ b/fzzy-igdss-web/src/main/resources/templates/main.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--360娴忚鍣ㄤ紭鍏堜互webkit鍐呮牳瑙ｆ瀽-->
- <title>鑻ヤ緷浠嬬粛</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
diff --git a/fzzy-igdss-web/src/main/resources/templates/main_v1.html b/fzzy-igdss-web/src/main/resources/templates/main_v1.html
index e9bf06d..6c1b1ce 100644
--- a/fzzy-igdss-web/src/main/resources/templates/main_v1.html
+++ b/fzzy-igdss-web/src/main/resources/templates/main_v1.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>缁熻</title>
+ <title>鏅烘収绮簱绠＄悊绯荤粺</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
diff --git a/fzzy-igdss-web/src/main/resources/templates/main_v2.html b/fzzy-igdss-web/src/main/resources/templates/main_v2.html
index d242421..9164d54 100644
--- a/fzzy-igdss-web/src/main/resources/templates/main_v2.html
+++ b/fzzy-igdss-web/src/main/resources/templates/main_v2.html
@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <title>鎺у埗鍙�</title>
+ <title>鏅烘収绮簱绠＄悊绯荤粺</title>
<link rel="stylesheet" th:href="@{/ajax/libs/layui/css/layui.css}"/>
<!-- <link rel="stylesheet" href="${ctxPath}/assets/module/admin.css">-->
<!--[if lt IE 9]>
diff --git a/fzzy-igdss-web/src/main/resources/templates/main_v3.html b/fzzy-igdss-web/src/main/resources/templates/main_v3.html
index bc14500..0b1acbe 100644
--- a/fzzy-igdss-web/src/main/resources/templates/main_v3.html
+++ b/fzzy-igdss-web/src/main/resources/templates/main_v3.html
@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <title>宸ヤ綔鍙�</title>
+ <title>鏅烘収绮簱绠＄悊绯荤粺</title>
<link rel="stylesheet" href="/plugins/layui/css/layui.css" th:href="@{/plugins/layui/css/layui.css}"/>
<!-- <link rel="stylesheet" href="${ctxPath}/assets/module/admin.css">-->
diff --git a/fzzy-igdss-web/src/main/resources/templates/register.html b/fzzy-igdss-web/src/main/resources/templates/register.html
index da5f116..f3a2c62 100644
--- a/fzzy-igdss-web/src/main/resources/templates/register.html
+++ b/fzzy-igdss-web/src/main/resources/templates/register.html
@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
- <title>娉ㄥ唽鑻ヤ緷绯荤粺</title>
- <meta name="description" content="鑻ヤ緷鍚庡彴绠＄悊妗嗘灦">
+ <title>鏅烘収绮簱绠＄悊绯荤粺</title>
+ <meta name="description" content="鏅烘収绮簱绠＄悊绯荤粺">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
--
Gitblit v1.9.3