From 3ad537052477fe31f45bd2e16045d58b35713bdc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 24 五月 2025 09:19:59 +0800
Subject: [PATCH] refactor(env): 更新环境配置并优化代码
---
zhitan-vue/src/views/login.vue | 6 +++---
zhitan-vue/vite.config.js | 4 ++--
zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java | 4 ++++
zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java | 7 ++++---
zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue | 2 +-
zhitan-vue/src/layout/index.vue | 8 ++++----
zhitan-admin/src/main/resources/application-prod.yml | 4 ++--
zhitan-admin/src/main/resources/application.yml | 4 ++--
zhitan-vue/src/views/svg/equipmentfile/index.vue | 2 +-
9 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/zhitan-admin/src/main/resources/application-prod.yml b/zhitan-admin/src/main/resources/application-prod.yml
index f1b69ec..2080787 100644
--- a/zhitan-admin/src/main/resources/application-prod.yml
+++ b/zhitan-admin/src/main/resources/application-prod.yml
@@ -6,7 +6,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:postgresql://127.0.0.1:5432/postgres
+ url: jdbc:postgresql://192.168.0.24:5432/postgres
username: postgres
password: 123456
# 浠庡簱鏁版嵁婧�
@@ -65,5 +65,5 @@
realm: lanbao
client-id: DataCapture
client-secret: kplisa4lJHEIM6knqefVbxln85QbA5NX
- redirect-uri: http://192.168.12.236:80/social-callback
+ redirect-uri: http://192.168.0.24:8888/social-callback
scopes: [openid, email, phone, profile]
\ No newline at end of file
diff --git a/zhitan-admin/src/main/resources/application.yml b/zhitan-admin/src/main/resources/application.yml
index a128d14..7ed13b1 100644
--- a/zhitan-admin/src/main/resources/application.yml
+++ b/zhitan-admin/src/main/resources/application.yml
@@ -12,7 +12,7 @@
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
captchaType: math
# 鍩熷悕鍦板潃
- domainName: https://demo-ems.zhitancloud.com/prod-api
+ domainName: http://127.0.0.1:8088
# 寮�鍙戠幆澧冮厤缃�
server:
@@ -142,7 +142,7 @@
# 韪㈠嚭涔嬪墠鐧诲綍鐨�/涔嬪悗鐧诲綍鐨勭敤鎴凤紝榛樿韪㈠嚭涔嬪墠鐧诲綍鐨勭敤鎴�
kickoutAfter: false
rtdb:
- host: http://127.0.0.1:8086 # 鐢ㄦ埛鍚峳oot 瀵嗙爜12345678
+ host: http://192.168.0.24:8086 # 鐢ㄦ埛鍚峳oot 瀵嗙爜12345678
#token: AminQagYp5rjb09mFPYvriK0T0vlF-zmwboqtUzdcq3nkXNuhnEpMuG_Ht5vtfWC4xBIVOThvoxy5reTer9XcQ==
token: i8WwVZz3RvkEVF3qGaY8uIDXTFEe2PzjgrKebDzcxlYGKnR-kOK5Hf1S5G4z3p-lc9UO7MQS4qKGL4lIeHSw1A==
org: lanbao
diff --git a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java
index 312169a..744319d 100644
--- a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java
+++ b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java
@@ -64,6 +64,9 @@
@Resource
private ISysSocialService sysSocialService;
+ @Resource
+ private SysPermissionService permissionService;
+
/**
* 鐧诲綍楠岃瘉
*
@@ -170,6 +173,7 @@
LoginUser loginUser = new LoginUser();
loginUser.setUser(userService.selectUserById(list.get(0).getUserId()));
loginUser.setUserId(list.get(0).getUserId());
+ loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
// 鐢熸垚token
return tokenService.createToken(loginUser);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
index 6661e6a..5cbff37 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
@@ -148,10 +148,11 @@
if (CollectionUtils.isNotEmpty(meterImplements)) {
MeterImplement infor = meterImplements.get(0);
indexName = infor.getInstallactionLocation() + "_" + infor.getMeterName() + "_" + indexName;
+ pointData.setIndexName(indexName);
+ pointData.setIndexId(indexInfo.getIndexId());
+ voList.add(pointData);
}
- pointData.setIndexName(indexName);
- pointData.setIndexId(indexInfo.getIndexId());
- voList.add(pointData);
+
}
return voList;
}
diff --git a/zhitan-vue/src/layout/index.vue b/zhitan-vue/src/layout/index.vue
index 9be49fd..3df028a 100644
--- a/zhitan-vue/src/layout/index.vue
+++ b/zhitan-vue/src/layout/index.vue
@@ -33,10 +33,10 @@
</div>
<!-- 澶фā鍨嬫寜閽� -->
- <div class="right-menu-item ai-btn" @click="openAIModel">
- <svg-icon icon-class="ai" class="right-menu-icon" />
- <span class="right-menu-text">鏅鸿兘鍔╂墜</span>
- </div>
+<!-- <div class="right-menu-item ai-btn" @click="openAIModel">-->
+<!-- <svg-icon icon-class="ai" class="right-menu-icon" />-->
+<!-- <span class="right-menu-text">鏅鸿兘鍔╂墜</span>-->
+<!-- </div>-->
</div>
</div>
</div>
diff --git a/zhitan-vue/src/views/login.vue b/zhitan-vue/src/views/login.vue
index ceb89f5..194e751 100644
--- a/zhitan-vue/src/views/login.vue
+++ b/zhitan-vue/src/views/login.vue
@@ -211,10 +211,10 @@
});
};
// 闈炲崟鐐圭櫥褰曟斁寮�涓嬭竟涓よ锛屽惁鍒欐敞閲婃帀
-getCode()
-getCookie()
+// getCode()
+// getCookie()
// 鍗曠偣鐧诲綍鏀惧紑涓嬭竟涓�琛岋紝鍚﹀垯娉ㄩ噴鎺�
-// doSocialLogin()
+doSocialLogin()
</script>
<style lang="scss" scoped>
diff --git a/zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue b/zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue
index 4a6cd04..9598c1d 100644
--- a/zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue
+++ b/zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue
@@ -126,7 +126,7 @@
modelInfoOptions.value = response.data
if (flag) {
if (modelInfoOptions.value.length > 0) {
- modelData.value = modelInfoOptions.value[1].modelCode
+ modelData.value = modelInfoOptions.value[0].modelCode
getTreeList(modelData.value)
}
}
diff --git a/zhitan-vue/src/views/svg/equipmentfile/index.vue b/zhitan-vue/src/views/svg/equipmentfile/index.vue
index b689a8d..4355c64 100644
--- a/zhitan-vue/src/views/svg/equipmentfile/index.vue
+++ b/zhitan-vue/src/views/svg/equipmentfile/index.vue
@@ -70,7 +70,7 @@
import { useRoute } from "vue-router"
let { proxy } = getCurrentInstance()
let treeLoading = ref(true)
-let modelData = ref(null)
+let modelData = ref('LBJT')
let modelInfoOptions = ref([]) //涓嬫媺鍒楄〃
const configureViewRef = ref()
//鑾峰彇涓嬫媺鍒楄〃
diff --git a/zhitan-vue/vite.config.js b/zhitan-vue/vite.config.js
index 68e341e..ef4c075 100644
--- a/zhitan-vue/vite.config.js
+++ b/zhitan-vue/vite.config.js
@@ -33,12 +33,12 @@
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
"/dev-api": {
- target: "http://localhost:8080",
+ target: "http://localhost:8088",
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, "/"),
},
"/prod-api": {
- target: "http://localhost:8080",
+ target: "http://localhost:8088",
changeOrigin: true,
secure: true,
},
--
Gitblit v1.9.3