diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
index ce39e96..c9f4e36 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
@@ -27,6 +27,8 @@ public class LoginUser implements Serializable {
*/
private String username;
+ private String email;
+
/**
* 登录时间
*/
@@ -128,4 +130,8 @@ public class LoginUser implements Serializable {
public void setSysUser (SysUser sysUser) {
this.sysUser = sysUser;
}
+
+ public CharSequence getEmail() {
+ return this.email=email;
+ }
}
diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml
index ea46d7e..dbdf671 100644
--- a/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml
+++ b/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml
@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
is_dict,
default_value,
dict_key,
+ dictionary_id,
create_by,
create_time,
update_by,
@@ -86,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{isDict},
#{defaultValue},
#{dictKey},
+ #{dictionaryId},
#{createBy},
#{createTime},
#{updateBy},
@@ -93,45 +95,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{remark},
-
- insert into `asset_model_copy1`
-
- `data_asset_id`,
- `name`,
- `comment`,
- `is_primary_key`,
- `type`,
- `mapping_type`,
- `length`,
- `decimal_places`,
- `is_null`,
- `is_dict`,
- `default_value`,
- `dict_key`,
- `create_by`,
- `create_time`,
-
- values
-
-
- #{item.dataAssetId},
- #{item.name},
- #{item.comment},
- #{item.isPrimaryKey},
- #{item.type},
- #{item.mappingType},
- #{item.length},
- #{item.decimalPlaces},
- #{item.isNull},
- #{item.isDict},
- #{item.defaultValue},
- #{item.dictKey},
- #{item.createBy},
- #{item.createTime},
-
-
+
+ INSERT INTO `asset_model_copy1` (
+ `data_asset_id`, `name`, `comment`, `is_primary_key`, `type`, `mapping_type`,
+ `length`, `decimal_places`, `is_null`, `is_dict`, `default_value`, `dict_key`,
+ `dictionary_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`
+ ) VALUES
+
+ (
+ #{item.dataAssetId}, #{item.name}, #{item.comment}, #{item.isPrimaryKey}, #{item.type}, #{item.mappingType},
+ #{item.length}, #{item.decimalPlaces}, #{item.isNull}, #{item.isDict}, #{item.defaultValue}, #{item.dictKey},
+ #{item.dictionaryId}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
update asset_model_copy1
diff --git a/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/ClassLoading/CustomClassLoader.java b/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/ClassLoading/CustomClassLoader.java
index fe3d92c..4083c8d 100644
--- a/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/ClassLoading/CustomClassLoader.java
+++ b/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/ClassLoading/CustomClassLoader.java
@@ -6,45 +6,6 @@ import java.net.URL;
import java.net.URLClassLoader;
public class CustomClassLoader extends ClassLoader {
-// public CustomClassLoader(ClassLoader parent, String classPath) throws MalformedURLException {
-// super(new URL[]{new URL("file:" + classPath)},parent);
-// }
-//
-// @Override
-// protected Class findClass(String name) throws ClassNotFoundException {
-// try {
-// byte[] classBytes = loadClassData(name);
-// return defineClass(name, classBytes, 0, classBytes.length);
-// } catch (IOException e) {
-// throw new ClassNotFoundException(name, e);
-// }
-// }
-//
-// private byte[] loadClassData(String className) throws IOException {
-// String fileName = className.replace('.', File.separatorChar) + ".class";
-// File classFile = new File(getPathForResource(fileName));
-// if (!classFile.exists()) {
-// throw new FileNotFoundException("Class file not found: " + classFile.getAbsolutePath());
-// }
-//
-// try (InputStream in = new FileInputStream(classFile)) {
-// ByteArrayOutputStream out = new ByteArrayOutputStream();
-// byte[] buffer = new byte[4096];
-// int n;
-// while ((n = in.read(buffer)) != -1) {
-// out.write(buffer, 0, n);
-// }
-// return out.toByteArray();
-// }
-// }
-//
-// private String getPathForResource(String resource) {
-// URL url = super.getResource(resource);
-// if (url == null) {
-// throw new IllegalArgumentException("Resource not found: " + resource);
-// }
-// return url.getPath();
-// }
public Class defineClassFromBytes(String name, byte[] data) {
return defineClass(name, data, 0, data.length);
diff --git a/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/controller/EngineMaintenanceController.java b/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/controller/EngineMaintenanceController.java
index 0eff585..aebb6d6 100644
--- a/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/controller/EngineMaintenanceController.java
+++ b/muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/controller/EngineMaintenanceController.java
@@ -107,4 +107,5 @@ public class EngineMaintenanceController extends BaseController
{
return toAjax(engineMaintenanceService.deleteEngineMaintenanceByIds(ids));
}
+
}