fase()分层

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java

@@ -20,4 +20,6 @@ public class ServiceNameConstants {
      * 文件服务的serviceid
      */
     public static final String FILE_SERVICE = "muyu-file";
+
+    public static final String TEST_MUYU = "muyu-test";
 }

muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-goods-edition</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-goods-edition-clinet</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/constant/ConfigCodeConstants.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.constant;
+package com.muyu.edition.constant;
 
 /**
  * 配置编码常量
@@ -11,7 +11,7 @@ public class ConfigCodeConstants {
      * 文件基础路径
      */
 //    public final static String BASE_FILE_PATH="D:/workspace/gtl-ruoyi-server/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/scope/";
-    public final static String BASE_FILE_PATH="D:\\woster\\gs1\\assets-ser\\muyu-modules\\muyu-goods\\src\\main\\java\\com\\muyu\\goods\\scope\\";
+    public final static String BASE_FILE_PATH="D:\\woster\\gs1\\gf\\assets-ser\\muyu-modules\\muyu-goods-edition\\muyu-goods-edition-server\\src\\main\\java\\com\\muyu\\edition\\scope\\";
     /**
      * 配置文件名数组
      */

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/constant/RuleOperationConstants.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.constant;
+package com.muyu.edition.constant;
 
 /**
  * 规则运行常量

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/Anduser.java

@@ -1,11 +1,11 @@
-package com.muyu.goods.domain;
+package com.muyu.edition.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
-import com.muyu.goods.domain.resp.AnduserIndexResp;
+import com.muyu.edition.domain.resp.AnduserIndexResp;
-import com.muyu.goods.domain.resp.AnduserQueryResp;
+import com.muyu.edition.domain.resp.AnduserQueryResp;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/Config.java

@@ -1,9 +1,9 @@
-package com.muyu.goods.domain;
+package com.muyu.edition.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 引擎对象 config

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/Cope.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.domain;
+package com.muyu.edition.domain;
 
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.Data;

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/Edition.java

@@ -1,9 +1,9 @@
-package com.muyu.goods.domain;
+package com.muyu.edition.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 规则引擎版本对象 edition

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/RuleEngine.java

@@ -1,9 +1,9 @@
-package com.muyu.goods.domain;
+package com.muyu.edition.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 规则引擎对象 rule_engine

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/model/TextData.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.domain.model;
+package com.muyu.edition.domain.model;
 
 import lombok.Data;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/req/RuleEditionReq.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.domain.req;
+package com.muyu.edition.domain.req;
 
 import lombok.Data;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/req/SpliceRep.java

@@ -0,0 +1,5 @@
+package com.muyu.edition.domain.req;
+
+public class SpliceRep {
+
+}

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/resp/AnduserIndexResp.java

@@ -1,6 +1,5 @@
-package com.muyu.goods.domain.resp;
+package com.muyu.edition.domain.resp;
 
-import com.muyu.goods.domain.Anduser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/resp/AnduserQueryResp.java

@@ -1,7 +1,5 @@
-package com.muyu.goods.domain.resp;
+package com.muyu.edition.domain.resp;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.muyu.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/resp/AnduserUpdateResp.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.domain.resp;
+package com.muyu.edition.domain.resp;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/domain/resp/EngineConfigResp.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.domain.resp;
+package com.muyu.edition.domain.resp;
 
 import lombok.Data;
 import lombok.experimental.SuperBuilder;

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/MuYuGoodsEditionApplication.java

@@ -1,18 +1,17 @@
-package com.muyu.goods;
+package com.muyu.edition;
 
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
-public class MuYuGoodsApplication {
+public class MuYuGoodsEditionApplication {
     public static void main(String[] args) {
-        SpringApplication.run(MuYuGoodsApplication.class,args);
+        SpringApplication.run(MuYuGoodsEditionApplication.class,args);
     }
 }

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/controller/ConfigController.java

@@ -1,28 +1,21 @@
-package com.muyu.goods.controller;
+package com.muyu.edition.controller;
 
-import java.util.List;
+import com.muyu.common.core.domain.Result;
-import javax.servlet.http.HttpServletResponse;
+import com.muyu.common.core.utils.poi.ExcelUtil;
-
+import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.goods.domain.model.TextData;
+import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.goods.domain.resp.EngineConfigResp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.goods.domain.Config;
+import com.muyu.edition.domain.Config;
-import com.muyu.goods.service.IConfigService;
+import com.muyu.edition.domain.model.TextData;
-import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.edition.domain.resp.EngineConfigResp;
-import com.muyu.common.core.domain.Result;
+import com.muyu.edition.service.IConfigService;
-import com.muyu.common.core.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.muyu.common.core.web.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 引擎Controller

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/controller/CopeController.java

@@ -1,11 +1,9 @@
-package com.muyu.goods.controller;
+package com.muyu.edition.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.security.annotation.RequiresPermissions;
+import com.muyu.edition.domain.Cope;
-import com.muyu.goods.domain.Cope;
+import com.muyu.edition.service.CopeService;
-import com.muyu.goods.service.CopeService;
-import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/controller/EditionController.java

@@ -1,25 +1,19 @@
-package com.muyu.goods.controller;
+package com.muyu.edition.controller;
 
-import java.util.List;
+import com.muyu.common.core.domain.Result;
-import javax.servlet.http.HttpServletResponse;
+import com.muyu.common.core.utils.poi.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.muyu.common.core.web.controller.BaseController;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.muyu.common.core.web.page.TableDataInfo;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.goods.domain.Edition;
+import com.muyu.edition.domain.Edition;
-import com.muyu.goods.service.IEditionService;
+import com.muyu.edition.service.IEditionService;
-import com.muyu.common.core.web.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.muyu.common.core.domain.Result;
+import org.springframework.web.bind.annotation.*;
-import com.muyu.common.core.utils.poi.ExcelUtil;
+
-import com.muyu.common.core.web.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 规则引擎版本Controller

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/controller/RuleEngineController.java

@@ -1,18 +1,19 @@
-package com.muyu.goods.controller;
+package com.muyu.edition.controller;
 
-import java.util.List;
+import com.muyu.common.core.domain.Result;
-import javax.servlet.http.HttpServletResponse;
+import com.muyu.common.core.utils.poi.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.muyu.common.core.web.controller.BaseController;
-import org.springframework.web.bind.annotation.*;
+import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.goods.domain.RuleEngine;
+import com.muyu.edition.domain.RuleEngine;
-import com.muyu.goods.service.IRuleEngineService;
+import com.muyu.edition.service.IRuleEngineService;
-import com.muyu.common.core.web.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.muyu.common.core.domain.Result;
+import org.springframework.web.bind.annotation.*;
-import com.muyu.common.core.utils.poi.ExcelUtil;
+
-import com.muyu.common.core.web.page.TableDataInfo;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 规则引擎Controller

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/dymamicLoad/DynamicLoader.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.dymamicLoad;
+package com.muyu.edition.dymamicLoad;
 
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/dymamicLoad/MemoryJavaFileManager.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.dymamicLoad;
+package com.muyu.edition.dymamicLoad;
 
 import javax.tools.*;
 import java.io.*;

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/mapper/ConfigMapper.java

@@ -1,7 +1,8 @@
-package com.muyu.goods.mapper;
+package com.muyu.edition.mapper;
+
+import com.muyu.edition.domain.Config;
 
 import java.util.List;
-import com.muyu.goods.domain.Config;
 
 /**
  * 引擎Mapper接口

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/mapper/CopeMapper.java

@@ -1,6 +1,6 @@
-package com.muyu.goods.mapper;
+package com.muyu.edition.mapper;
 
-import com.muyu.goods.domain.Cope;
+import com.muyu.edition.domain.Cope;
 
 import java.util.List;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/mapper/EditionMapper.java

@@ -1,7 +1,8 @@
-package com.muyu.goods.mapper;
+package com.muyu.edition.mapper;
+
+import com.muyu.edition.domain.Edition;
 
 import java.util.List;
-import com.muyu.goods.domain.Edition;
 
 /**
  * 规则引擎版本Mapper接口

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/mapper/RuleEngineMapper.java

@@ -1,8 +1,9 @@
-package com.muyu.goods.mapper;
+package com.muyu.edition.mapper;
+
+import com.muyu.edition.domain.RuleEngine;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import com.muyu.goods.domain.RuleEngine;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * 规则引擎Mapper接口

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/scope/DataModelContextHolder.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.scope;
+package com.muyu.edition.scope;
 
 import lombok.Data;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/scope/DataSetContextHolder.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.scope;
+package com.muyu.edition.scope;
 
 import lombok.Data;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/scope/RecordContextHolder.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.scope;
+package com.muyu.edition.scope;
 
 import lombok.Data;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/scope/TaskContextHolder.java

@@ -1,4 +1,4 @@
-package com.muyu.goods.scope;
+package com.muyu.edition.scope;
 
 /**
  * 任务上下文

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/CopeService.java

@@ -1,6 +1,6 @@
-package com.muyu.goods.service;
+package com.muyu.edition.service;
 
-import com.muyu.goods.domain.Cope;
+import com.muyu.edition.domain.Cope;
 
 import java.util.List;
 

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/IConfigService.java

@@ -1,9 +1,10 @@
-package com.muyu.goods.service;
+package com.muyu.edition.service;
+
+import com.muyu.edition.domain.Config;
+import com.muyu.edition.domain.model.TextData;
+import com.muyu.edition.domain.resp.EngineConfigResp;
 
 import java.util.List;
-import com.muyu.goods.domain.Config;
-import com.muyu.goods.domain.model.TextData;
-import com.muyu.goods.domain.resp.EngineConfigResp;
 
 /**
  * 引擎Service接口

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/IEditionService.java

@@ -1,7 +1,8 @@
-package com.muyu.goods.service;
+package com.muyu.edition.service;
+
+import com.muyu.edition.domain.Edition;
 
 import java.util.List;
-import com.muyu.goods.domain.Edition;
 
 /**
  * 规则引擎版本Service接口

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/IRuleEngineService.java

@@ -1,9 +1,9 @@
-package com.muyu.goods.service;
+package com.muyu.edition.service;
-
-import java.util.List;
 
 import com.muyu.common.core.domain.Result;
-import com.muyu.goods.domain.RuleEngine;
+import com.muyu.edition.domain.RuleEngine;
+
+import java.util.List;
 
 /**
  * 规则引擎Service接口

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/impl/ConfigServiceImpl.java

@@ -1,7 +1,18 @@
-package com.muyu.goods.service.impl;
+package com.muyu.edition.service.impl;
+
+import com.muyu.common.core.exception.ServiceException;
+import com.muyu.edition.constant.ConfigCodeConstants;
+import com.muyu.edition.constant.RuleOperationConstants;
+import com.muyu.edition.domain.Config;
+import com.muyu.edition.domain.model.TextData;
+import com.muyu.edition.domain.resp.EngineConfigResp;
+import com.muyu.edition.dymamicLoad.DynamicLoader;
+import com.muyu.edition.mapper.ConfigMapper;
+import com.muyu.edition.service.IConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -9,20 +20,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.goods.constant.ConfigCodeConstants;
-import com.muyu.goods.constant.RuleOperationConstants;
-import com.muyu.goods.domain.model.TextData;
-import com.muyu.goods.domain.resp.EngineConfigResp;
-import com.muyu.goods.dymamicLoad.DynamicLoader;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.muyu.goods.mapper.ConfigMapper;
-import com.muyu.goods.domain.Config;
-import com.muyu.goods.service.IConfigService;
-
-import javax.validation.constraints.Max;
-
 /**
  * 引擎Service业务层处理
  *

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/impl/CopeServiceImpl.java

@@ -1,14 +1,12 @@
-package com.muyu.goods.service.impl;
+package com.muyu.edition.service.impl;
 
-import com.muyu.goods.domain.Cope;
+import com.muyu.edition.domain.Cope;
-import com.muyu.goods.mapper.CopeMapper;
+import com.muyu.edition.mapper.CopeMapper;
-import com.muyu.goods.service.CopeService;
+import com.muyu.edition.service.CopeService;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/impl/EditionServiceImpl.java

@@ -1,14 +1,14 @@
-package com.muyu.goods.service.impl;
+package com.muyu.edition.service.impl;
+
+import com.muyu.edition.domain.Edition;
+import com.muyu.edition.mapper.EditionMapper;
+import com.muyu.edition.service.IEditionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.muyu.goods.mapper.EditionMapper;
-import com.muyu.goods.domain.Edition;
-import com.muyu.goods.service.IEditionService;
-
 /**
  * 规则引擎版本Service业务层处理
  *

muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/service/impl/RuleEngineServiceImpl.java

@@ -1,22 +1,21 @@
-package com.muyu.goods.service.impl;
+package com.muyu.edition.service.impl;
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.edition.constant.ConfigCodeConstants;
+import com.muyu.edition.domain.RuleEngine;
+import com.muyu.edition.domain.req.RuleEditionReq;
+import com.muyu.edition.mapper.RuleEngineMapper;
+import com.muyu.edition.service.IRuleEngineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import com.muyu.common.core.domain.Result;
-import com.muyu.goods.constant.ConfigCodeConstants;
-import com.muyu.goods.domain.req.RuleEditionReq;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.muyu.goods.mapper.RuleEngineMapper;
-import com.muyu.goods.domain.RuleEngine;
-import com.muyu.goods.service.IRuleEngineService;
-
 /**
  * 规则引擎Service业务层处理
  *

muyu-modules/muyu-goods-edition/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu</artifactId>
+        <version>3.6.3</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>muyu-goods-edition</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>muyu-goods-edition-common</module>
+        <module>muyu-goods-edition-remote</module>
+        <module>muyu-goods-edition-server</module>
+        <module>muyu-goods-edition-clinet</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

muyu-modules/muyu-goods-tests/muyu-goods-test-clinet/src/main/java/com/muyu/edition/test/clinet/cllent/config/AccessConfig.java

@@ -0,0 +1,9 @@
+package com.muyu.edition.test.clinet.cllent.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+
+@ComponentScan
+@Import(value = AccessConfigRunner.class)
+public class AccessConfig {
+}

muyu-modules/muyu-goods-tests/muyu-goods-test-clinet/src/main/java/com/muyu/edition/test/clinet/cllent/config/AccessConfigRunner.java

@@ -0,0 +1,15 @@
+package com.muyu.edition.test.clinet.cllent.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+
+import java.rmi.server.RemoteServer;
+
+public class AccessConfigRunner implements ApplicationRunner {
+    @Autowired
+    private RemoteServer remoteServer;
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+    }
+}

muyu-modules/muyu-goods-tests/muyu-goods-test-common/pom.xml

@@ -17,4 +17,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>

muyu-modules/muyu-goods-tests/muyu-goods-test-remote/pom.xml

@@ -17,4 +17,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>

muyu-modules/muyu-goods-tests/muyu-goods-test-remote/src/main/java/com/muyu/data/test/remote/factory/DataMangFacrory.java

@@ -1,4 +1,17 @@
 package com.muyu.data.test.remote.factory;
 
+import com.muyu.common.core.constant.ServiceNameConstants;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+
+import java.rmi.Remote;
+
+//熔断
+@FeignClient(
+        contextId = "RemoteSys",
+        value = ServiceNameConstants.TEST_MUYU,
+        fallbackFactory = DataMangFacrory.class,
+        path = "/system"
+)
 public class DataMangFacrory {
 }

muyu-modules/muyu-goods-tests/muyu-goods-test-server/pom.xml

@@ -16,5 +16,13 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.0-jre</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 </project>

muyu-modules/muyu-goods-tests/muyu-goods-test-server/src/main/java/com/muyu/test/config/BloomFilterConfig.java

@@ -0,0 +1,24 @@
+package com.muyu.test.config;
+
+import com.google.common.hash.BloomFilter;
+import com.google.common.hash.Funnels;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.nio.charset.Charset;
+
+@Configuration
+public class BloomFilterConfig {
+
+    @Value("${bloom-filter-exrcted-insertions}")
+    private int expectedInsertions;
+
+    @Value("${bloom-filter.fpp}")
+    private double falsePositiveProbability;
+
+    @Bean
+    public BloomFilter<String> bloomFilter() {
+        return BloomFilter.create(Funnels.stringFunnel(Charset.defaultCharset()),expectedInsertions);
+    }
+}

muyu-modules/muyu-goods-unit/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu</artifactId>
+        <version>3.6.3</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>muyu-goods-unit</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-modules-system</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-goods</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+    </dependencies>
+
+</project>

muyu-modules/muyu-goods-users/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu</artifactId>
+        <version>3.6.3</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>muyu-goods-users</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/req/SpliceRep.java

@@ -1,5 +0,0 @@
-package com.muyu.goods.domain.req;
-
-public class SpliceRep {
-
-}

muyu-modules/muyu-goods/src/main/java/stream.java

@@ -1,11 +1,7 @@
-import com.muyu.goods.domain.Cope;
+import com.muyu.edition.domain.Cope;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

muyu-modules/muyu-goods/src/main/resources/bootstrap.yml

@@ -25,4 +25,4 @@ spring:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 logging:
   level:
-    com.muyu.goods.mapper: DEBUG
+    com.muyu.edition.mapper: DEBUG

muyu-modules/muyu-goods/src/main/resources/mapper/goods/ConfigMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.goods.mapper.ConfigMapper">
 
-    <resultMap type="com.muyu.goods.domain.Config" id="ConfigResult">
+    <resultMap type="com.muyu.edition.domain.Config" id="ConfigResult">
         <result property="id"    column="id"    />
         <result property="versionCode"    column="version_code"    />
         <result property="ruleContent"    column="rule_content"    />
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, version_code, rule_content, remark, rule_id from config
     </sql>
 
-    <select id="selectConfigList" parameterType="com.muyu.goods.domain.Config" resultMap="ConfigResult">
+    <select id="selectConfigList" parameterType="com.muyu.edition.domain.Config" resultMap="ConfigResult">
         <include refid="selectConfigVo"/>
         <where>
             <if test="versionCode != null  and versionCode != ''"> and version_code = #{versionCode}</if>
@@ -29,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectConfigVo"/>
         where id = #{id}
     </select>
-    <select id="listConfigEs" resultType="com.muyu.goods.domain.Config">
+    <select id="listConfigEs" resultType="com.muyu.edition.domain.Config">
         <include refid="selectConfigVo"/>
         where rule_id = #{ruleId}
     </select>
 
-    <insert id="insertConfig" parameterType="com.muyu.goods.domain.Config" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertConfig" parameterType="com.muyu.edition.domain.Config" useGeneratedKeys="true" keyProperty="id">
         insert into config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="versionCode != null">version_code,</if>
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateConfig" parameterType="com.muyu.goods.domain.Config">
+    <update id="updateConfig" parameterType="com.muyu.edition.domain.Config">
         update config
         <trim prefix="SET" suffixOverrides=",">
             <if test="versionCode != null">version_code = #{versionCode},</if>

muyu-modules/muyu-goods/src/main/resources/mapper/goods/CopeMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.goods.mapper.CopeMapper">
 
-    <select id="list" resultType="com.muyu.goods.domain.Cope">
+    <select id="list" resultType="com.muyu.edition.domain.Cope">
         select *
         from cope
     </select>

muyu-modules/muyu-goods/src/main/resources/mapper/goods/EditionMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.goods.mapper.EditionMapper">
 
-    <resultMap type="com.muyu.goods.domain.Edition" id="EditionResult">
+    <resultMap type="com.muyu.edition.domain.Edition" id="EditionResult">
         <result property="id"    column="id"    />
         <result property="ruleId"    column="rule_id"    />
         <result property="versionClass"    column="version_class"    />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, rule_id, version_class, name, version_code, edition_status, rule_status, rule_is_test, edition_content, rule_content from edition
     </sql>
 
-    <select id="selectEditionList" parameterType="com.muyu.goods.domain.Edition" resultMap="EditionResult">
+    <select id="selectEditionList" parameterType="com.muyu.edition.domain.Edition" resultMap="EditionResult">
         <include refid="selectEditionVo"/>
     </select>
 
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertEdition" parameterType="com.muyu.goods.domain.Edition" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertEdition" parameterType="com.muyu.edition.domain.Edition" useGeneratedKeys="true" keyProperty="id">
         insert into edition
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="ruleId != null">rule_id,</if>
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateEdition" parameterType="com.muyu.goods.domain.Edition">
+    <update id="updateEdition" parameterType="com.muyu.edition.domain.Edition">
         update edition
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>

muyu-modules/muyu-goods/src/main/resources/mapper/goods/RuleEngineMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.goods.mapper.RuleEngineMapper">
 
-    <resultMap type="com.muyu.goods.domain.RuleEngine" id="RuleEngineResult">
+    <resultMap type="com.muyu.edition.domain.RuleEngine" id="RuleEngineResult">
         <result property="ruleId"    column="rule_id"    />
         <result property="ruleName"    column="rule_name"    />
         <result property="ruleCode"    column="rule_code"    />
@@ -20,7 +20,7 @@
         select rule_id, rule_name, rule_code, rule_level, rule_type, rule_is_activate, rule_status, description, remark from rule_engine
     </sql>
 
-    <select id="selectRuleEngineList" parameterType="com.muyu.goods.domain.RuleEngine" resultMap="RuleEngineResult">
+    <select id="selectRuleEngineList" parameterType="com.muyu.edition.domain.RuleEngine" resultMap="RuleEngineResult">
         <include refid="selectRuleEngineVo"/>
         <where>
             <if test="ruleName != null  and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
@@ -40,7 +40,7 @@
         from rule_engine where rule_id = #{ruleId};
     </select>
 
-    <insert id="insertRuleEngine" parameterType="com.muyu.goods.domain.RuleEngine" useGeneratedKeys="true" keyProperty="ruleId">
+    <insert id="insertRuleEngine" parameterType="com.muyu.edition.domain.RuleEngine" useGeneratedKeys="true" keyProperty="ruleId">
         insert into rule_engine
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="ruleName != null">rule_name,</if>
@@ -64,7 +64,7 @@
         </trim>
     </insert>
 
-    <update id="updateRuleEngine" parameterType="com.muyu.goods.domain.RuleEngine">
+    <update id="updateRuleEngine" parameterType="com.muyu.edition.domain.RuleEngine">
         update rule_engine
         <trim prefix="SET" suffixOverrides=",">
             <if test="ruleName != null">rule_name = #{ruleName},</if>

pom.xml

@@ -216,6 +216,9 @@
         <module>muyu-modules</module>
         <module>muyu-common</module>
         <module>muyu-modules/muyu-goods-tests</module>
+        <module>muyu-modules/muyu-goods-users</module>
+        <module>muyu-modules/muyu-goods-unit</module>
+        <module>muyu-modules/muyu-goods-edition</module>
     </modules>
     <packaging>pom</packaging>