调整日志输出以及输出位置，更改交易商个性化接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/configuration/RabbitConfig.java

@@ -7,6 +7,7 @@ import org.springframework.amqp.core.TopicExchange;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 @Configuration
 public class RabbitConfig {
@@ -14,6 +15,17 @@ public class RabbitConfig {
     @Value("${rabbitmq.template.exchange}")
     private String exchangeName;
 
+    /*
+    *   解决占位符
+    * */
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer placeholderConfigurer(){
+        PropertySourcesPlaceholderConfigurer placeholderConfigurer = new PropertySourcesPlaceholderConfigurer();
+        placeholderConfigurer.setIgnoreUnresolvablePlaceholders(true);
+        return placeholderConfigurer;
+    }
+
+
     @Bean
     TopicExchange exchange() {
         return new TopicExchange(exchangeName);

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/InvestorController.java

@@ -377,16 +377,10 @@ public class InvestorController {
         return iUseraccountService.getTree(request);
     }
 
-    @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增-->初始化市场以及分组")
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/initMarketAndGroup")
-    public AjaxResult<InvestorInitPerAddResult> initMarketAndGroup(Long usergroupid, Long marketid, HttpServletRequest request) {
-        return iUseraccountService.initMarketAndGroup(usergroupid, marketid, request);
-    }
 
-    @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增-->初始化商品及保证金类别")
+    @ApiOperation("交易商管理-->个性化管理-->交易商个性化-->新增-->初始化交易商个性化信息")
     @ResponseBody
-    @RequestMapping(method = RequestMethod.GET, value = "/initGoodsAndBZ")
+    @RequestMapping(method = RequestMethod.GET, value = "/initInvestorPerson")
     public AjaxResult<InvestorInitPerAddResult> initGoodsAndBZ(Long usergroupid, Long marketid, Long goodsid, HttpServletRequest request) {
         return iUseraccountService.initGoodsAndBZ(usergroupid, marketid, goodsid, request);
     }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IUseraccountService.java

@@ -64,8 +64,6 @@ public interface IUseraccountService extends IService<Useraccount> {
 
     AjaxResult<UserGroupTreeResult> getTree(HttpServletRequest request);
 
-    AjaxResult<InvestorInitPerAddResult> initMarketAndGroup(Long usergroupid,Long marketid, HttpServletRequest request);
-
     AjaxResult<InvestorInitPerAddResult> initGoodsAndBZ(Long usergroupid, Long marketid, Long goodsid, HttpServletRequest request);
 
     AjaxResult traderPersonAdd(InvestorPersonAddParam param, HttpServletRequest request);

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -1179,7 +1179,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     }
 
     @Override
-    public AjaxResult<InvestorInitPerAddResult> initMarketAndGroup(Long usergroupid, Long marketid, HttpServletRequest request) {
+    public AjaxResult<InvestorInitPerAddResult> initGoodsAndBZ(Long usergroupid, Long marketid, Long goodsid, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         InvestorInitPerAddResult result = new InvestorInitPerAddResult();
         if (usergroupid == null) {
@@ -1198,26 +1198,18 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             if (marketid == null) {
                 result.setMarkets(iMarketMapper.getNoTradeConfigMarkets(systemmanager.getAreauserid(), usergroupid));
             } else {
-                result.setGoods(iGoodsMapper.getNoTradeConfigGoods(systemmanager.getAreauserid(), usergroupid, marketid));
+                if(goodsid == null){
+                    result.setGoods(iGoodsMapper.getNoTradeConfigGoods(systemmanager.getAreauserid(), usergroupid, marketid));
+                }else{
+                    //客户类别
+                    result.setResults(iUseraccountMapper.getCustomerTypeByGoodsid(goodsid, null));
+                }
             }
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
     }
 
     @Override
-    public AjaxResult<InvestorInitPerAddResult> initGoodsAndBZ(Long usergroupid, Long marketid, Long goodsid, HttpServletRequest request) {
-        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        InvestorInitPerAddResult result = new InvestorInitPerAddResult();
-        if (marketid != null) {
-            result.setGoods(iGoodsMapper.getNoTradeConfigGoods(systemmanager.getAreauserid(), usergroupid, marketid));
-        } else {
-            //客户类别
-            result.setResults(iUseraccountMapper.getCustomerTypeByGoodsid(goodsid, null));
-        }
-        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
-    }
-
-    @Override
     public AjaxResult traderPersonAdd(InvestorPersonAddParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         if (param.getFlag() == 0) {

mtp3-century/src/main/resources/logback-spring.xml

@@ -5,13 +5,10 @@
     <!-- 定义应用名称，区分应用 -->
     <property name="APP_NAME" value="logback-century"/>
     <!-- 定义日志文件的输出路径 -->
-    <property name="LOG_PATH" value="${user.home}/log/${APP_NAME}"/>
+    <property name="LOG_PATH" value="./log/${APP_NAME}"/>
     <!-- 定义日志文件名称和路径 -->
     <property name="LOG_FILE" value="${LOG_PATH}/info/application.log"/>
-    <!-- 定义警告级别日志文件名称和路径 -->
-    <property name="WARN_LOG_FILE" value="${LOG_PATH}/warn/warn.log"/>
-    <!-- 定义错误级别日志文件名称和路径 -->
-    <property name="ERROR_LOG_FILE" value="${LOG_PATH}/error/error.log"/>
+
 
     <!-- 将日志滚动输出到application.log文件中 -->
     <appender name="APPLICATION"
@@ -36,56 +33,6 @@
         </rollingPolicy>
     </appender>
 
-    <!-- 摘取出WARN级别日志输出到warn.log中 -->
-    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${WARN_LOG_FILE}</file>
-        <encoder>
-            <!-- 使用默认的输出格式打印 -->
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-        <!-- 设置 RollingPolicy 属性，用于配置文件大小限制，保留天数、文件名格式 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 文件命名格式 -->
-            <fileNamePattern>${LOG_PATH}/warn.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- 文件保留最大天数 -->
-            <maxHistory>30</maxHistory>
-            <!-- 文件大小限制 -->
-            <maxFileSize>50MB</maxFileSize>
-            <!-- 文件总大小 -->
-            <totalSizeCap>2000MB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 日志过滤器，将WARN相关日志过滤出来 -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>WARN</level>
-        </filter>
-    </appender>
-
-    <!-- 摘取出ERROR级别日志输出到error.log中 -->
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${ERROR_LOG_FILE}</file>
-        <encoder>
-            <!-- 使用默认的输出格式打印 -->
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-        <!-- 设置 RollingPolicy 属性，用于配置文件大小限制，保留天数、文件名格式 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 文件命名格式 -->
-            <fileNamePattern>${LOG_PATH}/error.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <!-- 文件保留最大天数 -->
-            <maxHistory>30</maxHistory>
-            <!-- 文件大小限制 -->
-            <maxFileSize>50MB</maxFileSize>
-            <!-- 文件总大小 -->
-            <totalSizeCap>2000MB</totalSizeCap>
-        </rollingPolicy>
-        <!-- 日志过滤器，将ERROR相关日志过滤出来 -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-    </appender>
-
     <!-- 配置控制台输出 -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -101,10 +48,6 @@
         <appender-ref ref="CONSOLE"/>
         <!-- 加入APPLICATION输出 -->
         <appender-ref ref="APPLICATION"/>
-        <!-- 加入WARN日志输出 -->
-        <appender-ref ref="WARN"/>
-        <!-- 加入ERROR日志输出 -->
-        <appender-ref ref="ERROR"/>
     </root>
 
     <logger name="org.mybatis" level="DEBUG">
@@ -112,9 +55,5 @@
         <appender-ref ref="CONSOLE"/>
         <!-- 加入APPLICATION输出 -->
         <appender-ref ref="APPLICATION"/>
-        <!-- 加入WARN日志输出 -->
-        <appender-ref ref="WARN"/>
-        <!-- 加入ERROR日志输出 -->
-        <appender-ref ref="ERROR"/>
     </logger>
 </configuration>

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/InvestorInitPerAddResult.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "InvestorForPerAddParam对象", description = "交易商个性化设置分组交易商列表")
+@ApiModel(value = "InvestorInitPerAddResult对象", description = "交易商个性化设置分组交易商列表")
 public class InvestorInitPerAddResult {
 
     private List<Usergroup> userGroups;