diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml
index 06ac746..1c0718e 100644
--- a/cloud-auth/src/main/resources/bootstrap.yml
+++ b/cloud-auth/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: xyr
# Spring
spring:
application:
diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java
index 50f2341..8c85947 100644
--- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java
+++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java
@@ -1,5 +1,7 @@
package com.muyu.common.cache;
+import org.jetbrains.annotations.NotNull;
+
/**
* 主键基础
* * @className: PrimaryKeyBasic ️✈️
diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml
index 7ed6a9e..dfefd86 100644
--- a/cloud-gateway/src/main/resources/bootstrap.yml
+++ b/cloud-gateway/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: xyr
# Spring
spring:
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java
index 63b0a42..04fdf02 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java
@@ -84,7 +84,6 @@ public class SysCar extends BaseEntity{
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
- .append("remark", getRemark())
.toString();
}
}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml
index d9fd4f6..e94a784 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml
@@ -21,6 +21,7 @@
com.muyu
enterpise-common
+ ${muyu.version}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
index 17edc68..efe9200 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
@@ -22,6 +22,7 @@
com.muyu
enterpise-common
+ ${muyu.version}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java
index abd13a3..65a1fc8 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java
@@ -15,5 +15,5 @@ import java.util.List;
@Mapper
public interface SysCarMapper extends BaseMapper{
- List selectSysCarList(SysCar sysCar);
+// List selectSysCarList(SysCar sysCar);
}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java
index 8ca2562..fd6a542 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java
@@ -19,6 +19,6 @@ import java.util.List;
*/
public interface SysTypeMapper extends BaseMapper {
- List selectSysList();
+// List selectSysList();
}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java
index 6dc4e15..4717e18 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java
@@ -39,8 +39,6 @@ public class SysCarServiceImpl
LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
Assert.notNull(id, "id不可为空");
queryWrapper.eq(SysCar::getId, id);
-
-
return this.getOne(queryWrapper);
}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java
index e2f8728..be9475d 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java
@@ -30,7 +30,7 @@ public class SysTypeServiceImpl
*/
@Override
public List selectSysTypeList() {
- return sysTypeMapper.selectSysList();
+ return this.list();
}
diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
index 59bb63a..7f2f29b 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
@@ -19,7 +19,7 @@ spring:
allow-bean-definition-overriding: true
application:
# 应用名称
- name: cloud-warn
+ name: cloud-saas
profiles:
# 环境配置
active: dev
diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml
index 6c762b2..c3ff392 100644
--- a/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml
+++ b/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml
@@ -30,6 +30,7 @@
com.muyu
enterpise-common
+ ${muyu.version}
diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
index 46a342b..167c09f 100644
--- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: xyr
# Spring
spring:
diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
index 0a5455a..6b135ee 100644
--- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: xyr
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
diff --git a/cloud-modules/cloud-modules-parse/pom.xml b/cloud-modules/cloud-modules-parse/pom.xml
index 615660e..91a2e59 100644
--- a/cloud-modules/cloud-modules-parse/pom.xml
+++ b/cloud-modules/cloud-modules-parse/pom.xml
@@ -99,6 +99,7 @@
com.muyu
enterpise-common
+ ${muyu.version}
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
index 1a529e6..ff1b73b 100644
--- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: xyr
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
index f594774..93371a1 100644
--- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
+++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: xyr
# Spring
spring:
diff --git a/pom.xml b/pom.xml
index e2515e1..144c170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,11 +277,11 @@
${muyu.version}
-
- com.muyu
- enterpise-common
- ${muyu.version}
-
+
+
+
+
+
com.muyu