tanghc
							
						 | 
						
							
							
							
							
								
							
								5cf200b106
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								43bd300f4a
								
							
								
							
						 | 
						
							
							
								
								4.2.7
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								c475a1b8cd
								
							
								
							
						 | 
						
							
							
								
								4.2.6
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								f18babee45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-gateway/pom.xml
#	sop-gateway/src/main/resources/application-dev.properties
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								5af379160c
								
							
								
							
						 | 
						
							
							
								
								4.2.6
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								0f5f659b48
								
							
								
							
						 | 
						
							
							
								
								4.2.5
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								2f707cc99d
								
							
								
							
						 | 
						
							
							
								
								4.2.5
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								726e35116c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-example/sop-story/src/main/resources/application-dev.properties
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								8efd1fc7b4
								
							
								
							
						 | 
						
							
							
								
								4.2.5
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e09f332fe6
								
							
								
							
						 | 
						
							
							
								
								4.2.5
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								d642a4f9c6
								
							
								
							
						 | 
						
							
							
								
								修复restful负载均衡问题
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								8d071e2ac3
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								a3d97a4f8c
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								b053c7b4e5
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								ab421ea3be
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								883a6afd0b
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								c5e39ded8a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								14e0383617
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								32425e7903
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								db384fe8a0
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								1457c7898e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								9fa4ccce2b
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								4451918acb
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								f12b6e7b01
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e416080de4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								1ff4303d2f
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								dee635ba6c
								
							
								
							
						 | 
						
							
							
								
								4.2.3
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								72ced304ad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								44e321720a
								
							
								
							
						 | 
						
							
							
								
								4.2.3
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								ced55fb3b2
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								950e8a53c3
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e40d885078
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3fce909a35
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								eecbce1e4d
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								019fa9db09
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e92f7c480d
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								78f81ee180
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-admin/sop-admin-server/src/main/resources/public/index.html
#	sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/ServiceConfiguration.java
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								f59223b36e
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								37f61700c1
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								354d9c70b0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3d68ea80cd
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								ae717f094f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								c0e165f59b
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								376c5179b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								01937163b3
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								4e6de894f0
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								a79272df2d
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								47b7037a12
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								32c3925986
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3d40b9b245
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago |