| 
					
				 | 
			
			
				@@ -9,7 +9,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #常规设置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-server.port =10006 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+server.port=20006 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 server.servlet.context-path= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.servlet.multipart.max-file-size=40MB 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.servlet.multipart.max-request-size=40MB 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -20,7 +20,7 @@ spring.devtools.add-properties=true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.datasource.druid.db-type=mysql 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-spring.datasource.url=jdbc:mysql://121.43.111.127:3306/supply_dev?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+spring.datasource.url=jdbc:mysql://121.43.111.127:3306/gj_supply_dev?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.datasource.username=root 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.datasource.password=xch!eCdvc124@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 spring.datasource.druid.connection-init-sqls=set names utf8mb4 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -86,12 +86,10 @@ spring.redis.timeout=100000ms 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ##################################金蝶系统############## 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-k3.cloud.url=http://120.24.66.171:8888/k3cloud/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-#账套 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-#k3.cloud.db=62ce3a2a95db55 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-#k3.cloud.db=6308b332906629 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+k3.cloud.url=http://39.108.234.208:81/k3cloud/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #账套 测试9.21 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-k3.cloud.db=632a890e851ff7 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+k3.cloud.db=63184edc686295 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #账号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 k3.cloud.account=administrator 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #密码 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -100,7 +98,7 @@ k3.cloud.password=123456a! 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 k3.cloud.lang=2052 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #############供应链业务服务###################### 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-supply.url=http://127.0.0.1:10005 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+supply.url=http://127.0.0.1:20005 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 supply.automatic.reserved=${supply.url}/reserve/automaticReserved 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 supply.automatic.sales=${supply.url}/sale/order/syncOrder 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 supply.automatic.stock.in=${supply.url}/sale/order/syncInvoiceOrder 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -108,12 +106,12 @@ supply.stock.full.cost=${supply.url}/stock/cost/syncFullCost 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ##################################工程登录系统############## 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-engin.url=http://121.43.111.127:8080/sysadmin 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-engin.user.check.url=${engin.url}/other/login/tryLogin 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-engin.user.login.url=${engin.url}/login/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-file.url=http://hg.zfire.top/api/img/get?key= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#engin.url=http://121.43.111.127:8080/sysadmin 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#engin.user.check.url=${engin.url}/other/login/tryLogin 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#engin.user.login.url=${engin.url}/login/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#file.url=http://hg.zfire.top/api/img/get?key= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-server.max-http-header-size=50KB 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#server.max-http-header-size=50KB 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ####################阿里云配置###################### 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ali.access.key.id=LTAI4GK1q4mnpCFbonMd1pji 
			 |