预装箱单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -347,21 +347,21 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	 /**
 	  * 提交
 	  *
-	  * @param syPreAssembledPackingList
+	  * @param id
 	  * @return
 	  */
 	 @AutoLog(value = "预装箱单主表-提交")
 	 @ApiOperation(value="预装箱单主表-提交", notes="预装箱单主表-提交")
 	 @RequestMapping(value = "/submit", method = {RequestMethod.GET})
-	 public Result<SyPreAssembledPackingList> submit(@RequestBody SyPreAssembledPackingList syPreAssembledPackingList) {
+	 public Result<SyPreAssembledPackingList> submit(@RequestParam(value = "id",required = true) String id) {
 	 	Result<SyPreAssembledPackingList> result=new Result<>();
 	 	try{
-			if(oConvertUtils.isEmpty(syPreAssembledPackingList.getId())){
+			if(oConvertUtils.isEmpty(id)){
 				result.setMessage("未获取到id!");
 				result.setSuccess(false);
 				return result;
 			}
-			SyPreAssembledPackingList syPreAssembledPackingList2=syPreAssembledPackingListService.getById(syPreAssembledPackingList.getId());
+			SyPreAssembledPackingList syPreAssembledPackingList2=syPreAssembledPackingListService.getById(id);
 			if(oConvertUtils.isEmpty(syPreAssembledPackingList2)){
 				result.setMessage("未找到该数据!");
 				result.setSuccess(false);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -32,30 +32,30 @@ public class SyPreAssembledPackingList implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
 	@ApiModelProperty(value = "主键id")
 	private String id;
-	@Excel(name = "单据号", width = 15)
+	@Excel(name = "单据号", width = 35)
 	@ApiModelProperty(value = "单据号")
 	private java.lang.String documentNo;
 	/**发运明细主表id*/
 	@ApiModelProperty(value = "发运明细主表id")
 	private String syDeclarationElementsId;
 	/**订单号 可能要自动生成*/
-	@Excel(name="订单号", width = 15,needMerge = true,groupName = "主表信息")
+	@Excel(name="订单号", width = 25,needMerge = true,groupName = "主表信息")
 	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
 	/**款号*/
-	@Excel(name = "款号", width = 15,groupName = "主表信息")
+	@Excel(name = "款号", width = 25,groupName = "主表信息")
 	@ApiModelProperty(value = "款号")
 	private String itemNumber;
 	/**品名*/
-	@Excel(name = "品名", width = 15,groupName = "主表信息")
+	@Excel(name = "品名", width = 35,groupName = "主表信息")
 	@ApiModelProperty(value = "品名")
 	private String productName;
 	/**尺码范围*/
-	@Excel(name = "尺码范围", width = 15,groupName = "主表信息")
+	@Excel(name = "尺码范围", width = 25,groupName = "主表信息")
 	@ApiModelProperty(value = "尺码范围")
 	private String sizeRange;
 	/**客户*/
-	@Excel(name = "客户", width = 15,needMerge = true,groupName = "主表信息")
+	@Excel(name = "客户", width = 25,needMerge = true,groupName = "主表信息")
 	@ApiModelProperty(value = "客户")
 	private String customer;
 	/**集装箱代号*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -45,7 +45,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "发运明细子表id")
 	private String syDeclarationElementsItemId;
 	/**账套*/
-    @Excel(name = "账套", width = 15)
+    @Excel(name = "账套", width = 25)
 	@ApiModelProperty(value = "账套")
 	private String acSetNo;
 	/**成衣工厂*/
@@ -53,7 +53,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "成衣工厂")
 	private String garmentFactory;
 	/**HOD*/
-   // @Excel(name = "HOD", width = 15)
+   /@Excel(name = "HOD", width = 25,databaseFormat = "yyyy-MM-dd")
 	@ApiModelProperty(value = "HOD")
 	private String hod;
 	/**STYLE NO*/
@@ -211,8 +211,8 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	private java.math.BigDecimal factoryUnitPrice;
 	/**数量（按合并规则累计）*/
 //	@Excel(name = "数量（按合并规则累计）", width = 20)
-	@ApiModelProperty(value = "数量（按合并规则累计）")
-	private java.math.BigDecimal totalQuantity;
+/*	@ApiModelProperty(value = "数量（按合并规则累计）")
+	private java.math.BigDecimal totalQuantity;*/
 	/**客户简称*/
 	//@Excel(name = "客户简称", width = 20)
 	@ApiModelProperty(value = "客户简称")
@@ -220,7 +220,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 
 	/**二维表格*/
 	@TableField(exist = false)
-	@ExcelCollection(name="二维表格")
+	//@ExcelCollection(name="二维表格")
 	@ApiModelProperty(value = "二维表格")
 	private List<SizeTable> sizeTables;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/SyPreAssembledPackingListItemMapper.java

@@ -22,11 +22,11 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
     
 	public List<SyPreAssembledPackingListItem> selectByMainId(String mainId);
 
-	public List<SyPreAssembledPackingListItem> selectSyShippingDetailsItemData(@Param("value")String[] value);
+	public List<SyPreAssembledPackingListItem> selectSyShippingDetailsItemData(@Param("value")String value);
 
 	public List<SizeTable> selectSize(@Param("begin") String begin,@Param("end") String end);
 
-	public List<SizeTable> querySizes(@Param("value")String[] value);
+	public List<SizeTable> querySizes(@Param("value")String value);
 
 	public List<SizeTable> querySizes2(String ids);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -61,7 +61,7 @@
 		 	sy_shipping_details_item.account acSetNo,/*单据号 s*/
 		 	sy_shipping_details.garment_Factory garment_Factory, /*成衣工厂*/
 			sy_shipping_details_item.distribution_point distributionPoint,/*分销点 s*/
-			factory_unit_price factoryUnitPrice,/*工厂单价 s*/
+			factory_unit_price factoryUnitPrice,/* s*/
 			sales_Unit_Price UnitPrice,/*销售单价--> 单价*/
 			coding_Rules withCode,/*配码规则*/
 			sy_order_data_item.size,/*尺码 s*/
@@ -71,18 +71,15 @@
            	sy_shipping_details_item.distribution_Point distributionPoint, /*分销点 s*/
             sy_shipping_details_item.inventory_Name inventoryName, /*存货名称 s*/
             sum(shipment_Quantity) total,/*数量 s*/
-            sum(shipment_Quantity) totalQuantity,/*数量（按合并规则累计） s*/
-            sum(box_Number) boxNumber,/*箱数*/
+            SUM(shipment_Quantity)/box_Number piecesBox,
+            box_Number boxNumber,/*箱数*/
             sy_shipping_details_item.pur_Or_Sub_Order  purOrSubOrder /*采购/委外订单号 s*/
 		 FROM sy_shipping_details
 		 LEFT JOIN sy_shipping_details_item
 		 ON sy_shipping_details.`id`=sy_shipping_details_item.`shipping_details_id`
 		 LEFT JOIN sy_order_data_item
 		 ON sy_shipping_details_item.sy_order_data_item_id=sy_order_data_item.id
-		 where sy_shipping_details_item.del_flag = 0 and shipping_details_id in
-		<foreach collection="value" item="item" separator=","  open="(" close=")" >
-			#{item}
-		</foreach>
+		 where sy_shipping_details_item.del_flag = 0 and shipping_details_id =#{value}
 		group by sy_order_data_item.colour
 	</select>
 
@@ -96,10 +93,7 @@
 		SELECT DISTINCT sy_order_data_item.size FROM sy_shipping_details_item LEFT JOIN sy_order_data_item
 		 ON sy_shipping_details_item.sy_order_data_item_id=sy_order_data_item.id
 		 LEFT JOIN sizetable ON sy_order_data_item.`size`=sizetable.`size` OR sy_order_data_item.`size`=sizetable.`alias`
-		 WHERE shipping_details_id in
-		<foreach collection="value" item="item" separator=","  open="(" close=")" >
-			#{item}
-		</foreach>
+		 WHERE shipping_details_id =#{value}  AND sy_order_data_item.size IS NOT NULL
 		 ORDER BY sizetable.num
 	</select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -41,9 +41,9 @@
 			a.pre_delivery_date,/*预发货日期*/
 			a.order_type,/*订单类型*/
 			b.customer_abbreviation,/*客户简称*/
-			SUM(b.total) totalquantity,/*件数*/
+			SUM(b.total) total,/*件数*/
 			/*sum(b.total) totalquantity,*/
-			b.factory_unit_price,/*工厂单价*/
+			b.unit_price factoryUnitPrice,/*工厂单价*/
 			b.spur_or_sub_order,/*采购委外订单号*/
 			b.inventory_name,/*存货名称*/
 			b.small_po,/*小po*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/ISyPreAssembledPackingListItemService.java

@@ -29,7 +29,7 @@ public interface ISyPreAssembledPackingListItemService extends IService<SyPreAss
 	 * @param ids
 	 * @return
 	 */
-	public List<SizeTable> querySizes(String[] ids);
+	public List<SizeTable> querySizes(String ids);
 
 	public List<SizeTable> sort(List<SizeTable> sizes);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/ISyPreAssembledPackingListService.java

@@ -93,4 +93,5 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	 * @return	PackingHeaderVo
 	 */
 	public PackingHeaderVo pushData(String id);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListItemServiceImpl.java

@@ -93,7 +93,7 @@ public class SyPreAssembledPackingListItemServiceImpl extends ServiceImpl<SyPreA
 		return sizes;
 	}
 
-	public List<SizeTable> querySizes(String[] ids) {
+	public List<SizeTable> querySizes(String ids) {
 		return sort(syPreAssembledPackingListItemMapper.querySizes(ids));
 	}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -1,14 +1,10 @@
 package org.jeecg.modules.spapl.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiModelProperty;
-import org.jeecg.common.api.vo.Result;
+import org.hibernate.engine.jdbc.Size;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.documents.shippingDetails.controller.SyShippingDetailsController;
-import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsMapper;
 import org.jeecg.modules.spapl.entity.SizeTable;
@@ -61,7 +57,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		BigDecimal totalVolume=new BigDecimal(0);//总体积
 		BigDecimal totalPrice=new BigDecimal(0);//总价
 		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//添加主表数据
-		System.out.println("syPreAssembledPackingList的字段为："+syPreAssembledPackingList);
 		/*BigDecimal total;//总件数*/
 		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingList.getSyPreAssembledPackingListItemList()) {
 			totalBoxes=totalBoxes.add(entity.getBoxNumber());//箱数
@@ -117,7 +112,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			BigDecimal piecesBox=item.getPiecesBox();//箱/件数
 			item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表id
 			for (SizeTable size : sizes){
-				BigDecimal quantity=total.divide(piecesBox,4,BigDecimal.ROUND_HALF_UP) ;//总件数除以箱/件数
+				BigDecimal quantity=total.divide(piecesBox,4,BigDecimal.ROUND_HALF_UP) ;//总件数除以每箱件数 可以获得 箱数
 				quantity=quantity.multiply(new BigDecimal(size.getProportion()));//乘以比例可获得
 				item.setTotal(quantity);//该尺码件数
 				item.setSize(size.getSize());//获取尺码信息
@@ -220,13 +215,14 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			totalPrice=totalPrice.add(item.getTotalPrice());//总价
 			//item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表id
 			item.setDelFlag("0");//默认为未删除
+			int num=0;
 			for (SizeTable size : sizes){
 				BigDecimal quantity=total.divide(piecesBox,4,BigDecimal.ROUND_HALF_UP) ;//总件数除以箱/件数
 				quantity=quantity.multiply(new BigDecimal(size.getProportion()));//乘以比例可获得
 				item.setTotal(quantity);//该尺码件数
 				item.setSize(size.getSize());//获取尺码信息
 				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
-				item.setSort(size.getNum());//序号
+				item.setSort(++num);//序号
 				item.setId(size.getItemId());//从尺码表中获取到id
 				// 获取到子表id
 				String syDeclarationElementsItemId=syPreAssembledPackingListItemMapper.selectById(item.getId()).getSyDeclarationElementsItemId();
@@ -286,18 +282,22 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 
 	@Override
 	public SyPreAssembledPackingList queryPageList3(String id) {
-		//SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectSyShippingDetailsData(id.split(","));
-		SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
-		List<SyPreAssembledPackingListItem> list=syPreAssembledPackingListItemMapper.selectSyShippingDetailsItemData(id.split(","));
+		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectSyShippingDetailsData(id);
+		//SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
+		List<SizeTable> sizes=null;
+		List<SyPreAssembledPackingListItem> list=syPreAssembledPackingListItemMapper.selectSyShippingDetailsItemData(id);
 		for(SyPreAssembledPackingListItem item :list){
-			List<SizeTable> sizes=syPreAssembledPackingListItemMapper.querySize(item.getSyDeclarationElementsId(),item.getColour());//获取尺码信息
+			sizes=syPreAssembledPackingListItemMapper.querySize(item.getSyDeclarationElementsId(),item.getColour());//获取尺码信息
 			int row=0;
 			for (SizeTable size : sizes){
 				size.setNum(++row);
 			}
 			item.setSizeTables(sizes);
 		}
-		syPreAssembledPackingList.setSizeTables(syPreAssembledPackingListItemMapper.querySizes(id.split(",")));//获取所有尺码信息
+		sizes=syPreAssembledPackingListItemMapper.querySizes(id);
+		if(sizes.size()>0){
+			syPreAssembledPackingList.setSizeTables(sizes);//获取所有尺码信息
+		}
 		syPreAssembledPackingList.setSyPreAssembledPackingListItemList(list);
 		return syPreAssembledPackingList;
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -64,6 +64,10 @@ public class SyPreAssembledPackingListVo {
 	@ApiModelProperty(value = "成衣工厂")
   	@Excel(name = "成衣工厂", width = 15)
 	private String garmentFactory;
+	/**总件数*/
+	@ApiModelProperty(value = "数量（按合并规则累计）")
+	@Excel(name = "数量（按合并规则累计）", width = 15)
+	private java.math.BigDecimal total;
 	/**总箱数*/
 	@ApiModelProperty(value = "总箱数")
   	@Excel(name = "总箱数", width = 15)
@@ -164,9 +168,9 @@ public class SyPreAssembledPackingListVo {
 	@Excel(name = "工厂单价", width = 20)
 	private java.math.BigDecimal factoryUnitPrice;
 	//**数量（按合并规则累计）*//*
-	@ApiModelProperty(value = "数量（按合并规则累计）")
-	@Excel(name = "数量（按合并规则累计）", width = 20)
-	private java.math.BigDecimal totalQuantity;
+//	@ApiModelProperty(value = "数量（按合并规则累计）")
+//	@Excel(name = "数量（按合并规则累计）", width = 20)
+//	private java.math.BigDecimal totalQuantity;
 
 	
 }

jeecg-boot-module-system/target/classes/application-prodnew.yml

@@ -1,346 +0,0 @@
-server:
-  port: 8003
-  tomcat:
-    max-swallow-size: -1
-  error:
-    include-exception: true
-    include-stacktrace: ALWAYS
-    include-message: ALWAYS
-  servlet:
-    context-path: /jeecg-boot
-  compression:
-    enabled: true
-    min-response-size: 1024
-    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-
-spring:
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  ## quartz定时任务,采用数据库方式
-  quartz:
-    job-store-type: jdbc
-    initialize-schema: embedded
-    #定时任务启动开关，true-开  false-关
-    auto-startup: true
-    #启动时更新己存在的Job
-    overwrite-existing-jobs: true
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: MyScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: QRTZ_
-            isClustered: true
-            misfireThreshold: 60000
-            clusterCheckinInterval: 10000
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 10
-            threadPriority: 5
-            threadsInheritContextClassLoaderOfInitializingThread: true
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  jpa:
-    open-in-view: false
-  activiti:
-    check-process-definitions: false
-    #启用作业执行器
-    async-executor-activate: false
-    #启用异步执行器
-    job-executor-activate: false
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径，js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        loginUsername: admin
-        loginPassword: 123456
-        allow:
-      web-stat-filter:
-        enabled: true
-    dynamic:
-      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initial-size: 5
-        min-idle: 5
-        maxActive: 1000
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        #        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: root
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-        multi-one:
-          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_901_2021
-          username: sa
-          password: Windows2008R2
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-        multi-two:
-          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_902_2021
-          username: sa
-          password: Windows2008R2
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-        multi-three:
-          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_103_2021
-          username: cuidianpda
-          password: '*#cuidianpda0523'
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  #        multi-one:
-  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_101_2021
-  #          username: sa
-  #          password: Windows2008R2
-  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  #        multi-two:
-  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
-  #          username: sa
-  #          password: Windows2008R2
-  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  #        multi-three:
-  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_103_2021
-  #          username: sa
-  #          password: Windows2008R2
-  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-
-  #redis 配置
-  redis:
-    database: 0
-    host: 127.0.0.1
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: ''
-    port: 6379
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: ASSIGN_ID
-      # 默认数据库表下划线命名
-      table-underline: true
-  configuration:
-    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # 返回类型为Map,显示null对应的字段
-    call-setters-on-nulls: true
-#jeecg专用配置
-minidao :
-  base-package: org.jeecg.modules.jmreport.*
-jeecg :
-  # 是否启用安全模式
-  safeMode: false
-  # 签名密钥串(前后端要一致，正式发布请自行修改)
-  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
-  # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: alioss
-  path :
-    #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
-    #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
-  shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
-  #阿里云oss存储和大鱼短信秘钥配置
-  oss:
-    accessKey: ??
-    secretKey: ??
-    endpoint: oss-cn-beijing.aliyuncs.com
-    bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
-  # 表单设计器配置
-  desform:
-    # 主题颜色（仅支持 16进制颜色代码）
-    theme-color: "#1890ff"
-    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
-    upload-type: system
-    map:
-      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
-      baidu: ??
-  # 在线预览文件服务器地址配置
-  file-view-domain: http://fileview.jeecg.com
-  # minio文件上传
-  minio:
-    minio_url: http://minio.jeecg.com
-    minio_name: ??
-    minio_pass: ??
-    bucketName: otatest
-  #大屏报表参数设置
-  jmreport:
-    mode: prod
-    #数据字典是否进行saas数据隔离，自己看自己的字典
-    saas: false
-    #是否需要校验token
-    is_verify_token: true
-    #必须校验方法
-    verify_methods: remove,delete,save,add,update
-  #Wps在线文档
-  wps:
-    domain: https://wwo.wps.cn/office/
-    appid: ??
-    appsecret: ??
-  #xxl-job配置
-  xxljob:
-    enabled: false
-    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
-    appname: ${spring.application.name}
-    accessToken: ''
-    address: 127.0.0.1:30007
-    ip: 127.0.0.1
-    port: 30007
-    logPath: logs/jeecg/job/jobhandler/
-    logRetentionDays: 30
-  route:
-    config:
-      data-id: jeecg-gateway-router
-      group: DEFAULT_GROUP
-      #自定义路由配置 yml nacos database
-      data-type: database
-  #分布式锁配置
-  redisson:
-    address: 127.0.0.1:6379
-    password:
-    type: STANDALONE
-    enabled: true
-#cas单点登录
-cas:
-  prefixUrl: http://cas.example.org:8443/cas
-#Mybatis输出sql日志
-logging:
-  level:
-    org.jeecg.modules.system.mapper : info
-#swagger
-knife4j:
-  #开启增强配置
-  enable: true
-  #开启生产环境屏蔽
-  production: false
-  basic:
-    enable: true
-    username: jeecg
-    password: jeecg1314
-#第三方登录
-justauth:
-  enabled: true
-  type:
-    GITHUB:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
-    WECHAT_ENTERPRISE:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
-      agent-id: ??
-    DINGTALK:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
-    WECHAT_OPEN:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
-  cache:
-    type: default
-    prefix: 'demo::'
-    timeout: 1h
-#第三方APP对接
-third-app:
-  enabled: false
-  type:
-    #企业微信
-    WECHAT_ENTERPRISE:
-      enabled: false
-      #CORP_ID
-      client-id: ??
-      #SECRET
-      client-secret: ??
-      #自建应用id
-      agent-id: ??
-      #自建应用秘钥（新版企微需要配置）
-      # agent-app-secret: ??
-    #钉钉
-    DINGTALK:
-      enabled: false
-      # appKey
-      client-id: ??
-      # appSecret
-      client-secret: ??
-      agent-id: ??