From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-server/src/main/resources/application-prod.yml | 2 +-
rsf-server/src/main/resources/application.yml | 2 +-
rsf-admin/src/i18n/zh.js | 3 +--
rsf-admin/src/i18n/en.js | 2 --
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 0914029..01d776a 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -107,8 +107,6 @@
menu: {
dashboard: 'Dashboard',
settings: 'Settings',
- pakin: 'Pakin',
- basicSettings: 'Basic Setting',
system: 'System',
user: 'User',
role: 'Role',
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 8907d38..53667aa 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -107,8 +107,7 @@
menu: {
dashboard: '鎺у埗鍙�',
settings: '涓汉璁剧疆',
- basicSettings: '鍩虹璁剧疆',
- pakin: '缁勬墭',
+ basicInfo: '鍩虹淇℃伅',
system: '绯荤粺璁剧疆',
user: '鐢ㄦ埛绠＄悊',
role: '瑙掕壊绠＄悊',
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index a419dc7..ecc2fc2 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -10,7 +10,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index 5498f63..035aada 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: prod
config:
system-name: @pom.artifactId@
--
Gitblit v1.9.1