打印语句修改,删除多余的代码

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/ProductApi.java

@@ -29,6 +29,6 @@ public interface ProductApi {
     * @Author: guq
     * @Date: 2018/10/16
     */
-    @RequestMapping("/product/updateLatestPurchasePrice")
+    @RequestMapping("/api/document/product/updateLatestPurchasePrice")
     public void updateLatestPurchasePrice(@RequestParam(value = "id") Long pu_id);
 }

applications/document/document-api/src/main/resources/application.yml

@@ -1,44 +0,0 @@
-spring:
-  application:
-    name: document-api
-  security:
-    user:
-      name: admin
-      password: select111***
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false
-    username: root
-    password: select111***
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 50
-      idle-timeout: 30000
-      max-lifetime: 1800000
-      connection-timeout: 30000
-  messages:
-    basename: i18n/messages
-eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    status-page-url-path: /actuator/info
-    metadata-map:
-      user.name: ${spring.security.user.name}
-      user.password: ${spring.security.user.password}
-  client:
-    registryFetchIntervalSeconds: 5
-    serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
-server:
-  port: 9481
-  tomcat:
-    uri-encoding: UTF-8
-info:
-  name: '@project.artifactId@'
-  description: '@project.description@'
-  version: '@project.version@'
-  spring-boot-version: '@spring.boot.version@'
-  spring-cloud-version: '@spring.cloud.version@'
-auth:
-  public-key: auth/pub.key

applications/document/document-api/src/main/resources/banner.txt

@@ -1,15 +0,0 @@
-${AnsiColor.BRIGHT_YELLOW}
-
-88        88   ad88888ba     ,ad8888ba,    88888888888  888888888888  ,ad8888ba,   88        88  88  888b      88         db
-88        88  d8"     "8b   d8"'    `"8b   88                88      d8"'    `"8b  88        88  88  8888b     88        d88b
-88        88  Y8,          d8'        `8b  88                88     d8'            88        88  88  88 `8b    88       d8'`8b
-88        88  `Y8aaaaa,    88          88  88aaaaa           88     88             88aaaaaaaa88  88  88  `8b   88      d8'  `8b
-88        88    `"""""8b,  88          88  88"""""           88     88             88""""""""88  88  88   `8b  88     d8YaaaaY8b
-88        88          `8b  Y8,        ,8P  88                88     Y8,            88        88  88  88    `8b 88    d8""""""""8b
-Y8a.    .a8P  Y8a     a8P   Y8a.    .a8P   88                88      Y8a.    .a8P  88        88  88  88     `8888   d8'        `8b
- `"Y8888Y"'    "Y88888P"     `"Y8888Y"'    88                88       `"Y8888Y"'   88        88  88  88      `888  d8'          `8b
-
-
-Application Version: ${application.version}${application.formatted-version}
-Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
-${AnsiColor.DEFAULT}

applications/document/document-api/src/main/resources/logback-spring.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <jmxConfigurator/>
-
-    <!--
-    %m
-    输出代码中指定的消息
-    %p
-    输出优先级，即DEBUG，INFO，WARN，ERROR，FATAL
-    %r
-    输出自应用启动到输出该log信息耗费的毫秒数
-    %c
-    输出所属的类目，通常就是所在类的全名
-    %t
-    输出产生该日志事件的线程名
-    %n
-    输出一个回车换行符，Windows平台为“\r\n”，Unix平台为“\n”
-    %d
-    输出日志时间点的日期或时间，默认格式为ISO8601，也可以在其后指定格式，比如：%d{yyy MMM dd HH:mm:ss,SSS}，
-    输出类似：2002年10月18日 22：10：28，921
-    %l
-    输出日志事件的发生位置，包括类目名、发生的线程，以及在代码中的行数。举例：Testlog4.main(TestLog4.java:10)
-    -->
-
-    <springProperty scope="context" name="log.path" source="logging.path" defaultValue="/var/log/saas/document-api"/>
-    <springProperty scope="context" name="spring.application.name" source="spring.application.name" defaultValue="document-api"/>
-    <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
-    <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
-    <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-
-    <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
-
-
-    <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${log.level.console}</level>
-        </filter>
-        <encoder>
-            <pattern>${common-pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ROOT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/root.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 每天一归档 -->
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/root-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
-            <!-- 单个日志文件最多 100MB, 60天的日志周期，最大不能超过20GB -->
-            <maxFileSize>128MB</maxFileSize>
-            <maxHistory>60</maxHistory>
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${common-pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <root level="${log.level.console}">
-        <appender-ref ref="CONSOLE_APPENDER"/>
-        <appender-ref ref="ROOT_APPENDER"/>
-    </root>
-
-</configuration>

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -28,9 +28,7 @@ public class ProductController {
 
     @RequestMapping("/updateLatestPurchasePrice")
     public void updateLatestPurchasePrice(@RequestParam(value = "id") Long pu_id) {
-        System.out.println("------------" + pu_id + "--------------");
         productService.updateLatestPurchasePrice(pu_id);
-        System.out.println("------------" + pu_id + "--------------");
     };
 
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendorController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/document/vendor")
+@RequestMapping("/vendor")
 public class VendorController {
 
     @Autowired

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/PurchaseApplication.java

@@ -15,7 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableTransactionManagement
-@EnableFeignClients("com.usoftchina.saas.document.api")
+@EnableFeignClients("com.usoftchina.saas")
 //@EnableAuthClient
 @MapperScan("com.usoftchina.saas.purchase.mapper")
 public class PurchaseApplication {

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/config/WebMvcConfig.java

@@ -1,36 +0,0 @@
-package com.usoftchina.saas.purchase.config;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.nio.charset.Charset;
-import java.util.List;
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer{
-
-    @Bean
-    public HttpMessageConverter<String> responseBodyConverter() {
-        StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        return converter;
-    }
-
-    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        WebMvcConfigurer.super.configureMessageConverters(converters);
-        converters.add(responseBodyConverter());
-    }
-
-    @Bean
-    public RestTemplate restTemplate(){
-        RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getMessageConverters().add(0, responseBodyConverter());
-        return restTemplate;
-    }
-
-}

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -68,7 +68,6 @@ public class PurchaseController {
      */
     @GetMapping("/delete/{id}")
     public Result delete(@PathVariable("id") Long id) {
-        System.out.println(id);
         purchaseService.delete(id);
         return Result.success();
     }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchasedetailMapper.java

@@ -2,29 +2,28 @@ package com.usoftchina.saas.purchase.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.purchase.po.Purchase;
-import com.usoftchina.saas.purchase.po.Purchasedetail;
+import com.usoftchina.saas.purchase.po.PurchaseItem;
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 
 public interface PurchasedetailMapper extends CommonBaseMapper<Purchase> {
     int deleteByPrimaryKey(Integer pdId);
 
-    int insert(Purchasedetail record);
+    int insert(PurchaseItem record);
 
-    int insertSelective(Purchasedetail record);
+    int insertSelective(PurchaseItem record);
 
-    Purchasedetail selectByPrimaryKey(Integer pdId);
+    PurchaseItem selectByPrimaryKey(Integer pdId);
 
-    int updateByPrimaryKeySelective(Purchasedetail record);
+    int updateByPrimaryKeySelective(PurchaseItem record);
 
-    int updateByPrimaryKey(Purchasedetail record);
+    int updateByPrimaryKey(PurchaseItem record);
 
-    void batchInsert(List<Purchasedetail> list);
+    void batchInsert(List<PurchaseItem> list);
 
-    void batchUpdate(List<Purchasedetail> list);
+    void batchUpdate(List<PurchaseItem> list);
 
     void deleteByForeignKey(Long fk_id);
 
-    List<Purchasedetail> selectByFK(Long fk_i);
+    List<PurchaseItem> selectByFK(Long fk_i);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseItem.java

@@ -5,12 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
- * 采购明细
- *
- * @author yingp
- * @date 2018/10/9
- */
 @Data
 public class PurchaseItem extends CommonBaseEntity implements Serializable {
 
@@ -55,4 +49,5 @@ public class PurchaseItem extends CommonBaseEntity implements Serializable {
     private String pd_text5;
 
     private Double pd_yqty;
-}
+
+}

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/Purchasedetail.java

@@ -1,53 +0,0 @@
-package com.usoftchina.saas.purchase.po;
-
-import com.usoftchina.saas.base.entity.CommonBaseEntity;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class Purchasedetail extends CommonBaseEntity implements Serializable {
-
-    private  Long pd_puid;
-
-    private String pd_code;
-
-    private Integer pd_detno;
-
-    private Integer pd_prodid;
-
-    private String pd_prodcode;
-
-    private String pd_unit;
-
-    private Double pd_qty;
-
-    private Double pd_price;
-
-    private Double pd_total;
-
-    private Double pd_taxtotal;
-
-    private Double pd_acceptqty;
-
-    private Double pd_delivery;
-
-    private String pd_salecode;
-
-    private Integer pd_saledetno;
-
-    private Integer pd_sdid;
-
-    private String pd_text1;
-
-    private String pd_text2;
-
-    private String pd_text3;
-
-    private String pd_text4;
-
-    private String pd_text5;
-
-    private Double pd_yqty;
-
-}

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -3,7 +3,6 @@ package com.usoftchina.saas.purchase.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
-import com.netflix.discovery.converters.Auto;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.common.dto.DocBaseDTO;
@@ -71,12 +70,12 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //查询主表信息
         Purchase purchase = getMapper().selectByPrimaryKey(id);
         //查询从表
-        List<Purchasedetail> purchasedetails = purchasedetailMapper.selectByFK(id);
+        List<PurchaseItem> purchaseItems = purchasedetailMapper.selectByFK(id);
         //将purchase实体对象转化成传输对象
         PurchaseDTO main = BeanMapper.map(purchase, PurchaseDTO.class);
         List<PurchaseItemDTO> items = new ArrayList<>();
         //添加从表传输对象
-        for (Purchasedetail detail : purchasedetails) {
+        for (PurchaseItem detail : purchaseItems) {
             items.add(BeanMapper.map(detail, PurchaseItemDTO.class));
         }
         purchaseFormDTO.setMain(main);
@@ -92,8 +91,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //获取主表信息
         PurchaseDTO main = formdata.getMain();
         List<PurchaseItemDTO> items = formdata.getItems();
-        List<Purchasedetail> insertDetails = new ArrayList<>();
-        List<Purchasedetail> updateDetails = new ArrayList<>();
+        List<PurchaseItem> insertDetails = new ArrayList<>();
+        List<PurchaseItem> updateDetails = new ArrayList<>();
         Long pu_id = main.getId();
         String pu_code = main.getPu_code();
         Purchase purchase = BeanMapper.map(main, Purchase.class);
@@ -107,7 +106,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             purchaseMapper.updateByPrimaryKey(purchase);
             //添加从表传输对象
             for (PurchaseItemDTO item : items) {
-                Purchasedetail detail = BeanMapper.map(item, Purchasedetail.class);
+                PurchaseItem detail = BeanMapper.map(item, PurchaseItem.class);
                 detail.setPd_puid(pu_id);
                 detail.setPd_code(pu_code);
                 if (StringUtils.hasText(detail.getId())) {
@@ -131,7 +130,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         pu_id = purchase.getId();
         //添加从表传输对象
         for (PurchaseItemDTO item : items) {
-            Purchasedetail detail = BeanMapper.map(item, Purchasedetail.class);
+            PurchaseItem detail = BeanMapper.map(item, PurchaseItem.class);
             detail.setPd_puid(pu_id);
             detail.setPd_code(pu_code);
             insertDetails.add(detail);

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -115,7 +115,7 @@
             )
         </foreach>
     </insert>
-    <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
+    <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.PurchaseItem" >
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update purchasedetail <set>
             PD_PUID = #{item.pdPuid},

applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.purchase.mapper.PurchasedetailMapper" >
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.purchase.po.Purchasedetail" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.purchase.po.PurchaseItem" >
     <id column="PD_ID" property="id" jdbcType="INTEGER" />
     <result column="PD_PUID" property="pd_puid" jdbcType="INTEGER" />
     <result column="PD_CODE" property="pd_code" jdbcType="VARCHAR" />
@@ -44,7 +44,7 @@
     delete from purchasedetail
     where PD_ID = #{id}
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
+  <insert id="insert" parameterType="com.usoftchina.saas.purchase.po.PurchaseItem" >
     insert into purchasedetail (PD_PUID, PD_CODE,
     PD_DETNO, PD_PRODID, PD_PRODCODE,
     PD_UNIT, PD_QTY, PD_PRICE,
@@ -64,7 +64,7 @@
     #{pdText3,jdbcType=VARCHAR}, #{pdText4,jdbcType=VARCHAR}, #{pdText5,jdbcType=VARCHAR},
     #{pdYqty,jdbcType=DOUBLE})
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.PurchaseItem" >
     insert into purchasedetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="pdPuid != null" >
@@ -215,7 +215,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.PurchaseItem" >
     update purchasedetail
     <set >
       <if test="pdPuid != null" >
@@ -293,7 +293,7 @@
     </set>
     where PD_ID = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.purchase.po.PurchaseItem" >
     update purchasedetail
     set PD_PUID = #{pdPuid,jdbcType=INTEGER},
     PD_CODE = #{pdCode,jdbcType=VARCHAR},
@@ -346,7 +346,7 @@
       )
     </foreach>
   </insert>
-  <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
+  <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.PurchaseItem" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update purchasedetail <set>
       PD_PUID = #{item.pd_puid},