MES/mes-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改名

Browse Source
This commit is contained in:
zc
2026-06-12 16:35:54 +08:00
parent 33540f7d10
commit ee01b284ee
36 changed files with 571 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes-webapi/src/main/java/top/mes/admin/WmsAdminApplication.java → mes-webapi/src/main/java/top/mes/admin/MesAdminApplication.java
View File

@@ -31,12 +31,12 @@ import top.continew.starter.web.model.R;
@SpringBootApplication
@RequiredArgsConstructor
@EnableScheduling
public class WmsAdminApplication {
public class MesAdminApplication {
private final ProjectProperties projectProperties;
public static void main(String[] args) {
SpringApplication.run(WmsAdminApplication.class, args);
SpringApplication.run(MesAdminApplication.class, args);
}
@Hidden

18
mes-webapi/src/main/java/top/mes/admin/config/webSocket/WebSocketConfig.java
View File

@@ -1,18 +0,0 @@
package top.mes.admin.config.webSocket;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
import top.mes.admin.controller.weighManage.ah.ScaleWebSocketHandler;
@Configuration
@EnableWebSocket
public class WebSocketConfig implements WebSocketConfigurer {
@Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
// 注册WebSocket端点，允许所有跨域请求
registry.addHandler(new ScaleWebSocketHandler(), "/ws/scale").setAllowedOrigins("*");
}
}

10
mes-webapi/src/main/java/top/mes/admin/controller/schedule/DemoEnvironmentJob.java
View File

@@ -28,15 +28,25 @@ import java.util.function.BooleanSupplier;
public class DemoEnvironmentJob {
private final DictItemMapper dictItemMapper;
private final DictMapper dictMapper;
private final StorageMapper storageMapper;
private final UserMapper userMapper;
private final UserRoleMapper userRoleMapper;
private final UserSocialMapper userSocialMapper;
private final RoleMapper roleMapper;
private final RoleDeptMapper roleDeptMapper;
private final RoleMenuMapper roleMenuMapper;
private final MenuMapper menuMapper;
private final DeptMapper deptMapper;
private final ClientMapper clientsMapper;

18
mes-webapi/src/main/resources/config/application-dev.yml
View File

@@ -18,17 +18,9 @@ spring:
spring.datasource:
type: com.zaxxer.hikari.HikariDataSource
# 请务必提前创建好名为 wms_admin 的数据库，如果使用其他数据库名请注意同步修改 DB_NAME 配置
url: jdbc:p6spy:mysql://127.0.0.1:3306/wms_th?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:p6spy:mysql://127.0.0.1:3306/mes?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: root
# password: test123$
# PostgreSQL 配置
# url: jdbc:p6spy:mysql://192.168.2.30:${DB_PORT:3306}/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username: ${DB_USER:root}
# password: ${DB_PWD:SQLsql123}
# url: jdbc:p6spy:mysql://81.68.71.142:${DB_PORT:3306}/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username: ${DB_USER:root}
# password: ${DB_PWD:MYsql12@}
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
# Hikari 连接池配置
hikari:
@@ -55,12 +47,12 @@ spring.data:
## Redis 配置（单机模式）
redis:
# 地址
# host: ${REDIS_HOST:192.168.2.30}
host: ${REDIS_HOST:127.0.0.1}
host: ${REDIS_HOST:192.168.2.30}
# host: ${REDIS_HOST:127.0.0.1}
# 端口（默认 6379）
port: ${REDIS_PORT:6379}
# 密码（未设置密码时请注释掉）
# password: ${REDIS_PWD:redis2025}
password: ${REDIS_PWD:redis2025}
# 数据库索引
database: ${REDIS_DB:0}
# 连接超时时间
@@ -286,7 +278,7 @@ snail-job:
# 命名空间 ID
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
# 分组名
group: ${SCHEDULE_GROUP:wms-admin}
group: ${SCHEDULE_GROUP:mes-admin}
# 令牌
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}
## 服务端配置（任务调度中心）

2
mes-webapi/src/main/resources/config/application-prod.yml
View File

@@ -276,7 +276,7 @@ snail-job:
# 命名空间 ID
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
# 分组名
group: ${SCHEDULE_GROUP:wms-admin}
group: ${SCHEDULE_GROUP:mes-admin}
# 令牌
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}
## 服务端配置（任务调度中心）

4
mes-webapi/src/main/resources/config/application.yml
View File

@@ -3,7 +3,7 @@ project:
# 名称
name: Wms Admin
# 应用名称
app-name: wms-admin
app-name: mes-admin
# 版本
version: 3.6.0-SNAPSHOT
# 描述
@@ -18,7 +18,7 @@ project:
## 许可协议信息配置
license:
name: Apache-2.0
url: https://github.com/wms-org/wms-admin/blob/dev/LICENSE
url: https://github.com/wms-org/mes-admin/blob/dev/LICENSE
--- ### 日志配置
continew-starter.log: