Explorar el Código

Merge remote-tracking branch 'origin/prod'

albertshaw hace 8 años
padre
commit
ac3f92a2fc

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1420,7 +1420,7 @@
 		user_info c on b.id = c.uid
 	left join 
 		field_glossory d on a.field_a = d.id
-	where 
+	where
 		jmrh_flag = 1 and data_category = 1 and audit_status = 3
 	order by 
 		a.create_time asc

+ 7 - 3
src/main/resources/props/config_prod.properties

@@ -51,12 +51,16 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//sf.jishutao.com/1.0.40
+static.host=//s.jishutao.com/1.0.41
 
 template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//sf.jishutao.com/portal/1.0.10
+portal.host=//s.jishutao.com/portal/1.0.11
 
-patentTemplate=SMS_72005286
+patentTemplate=SMS_72005286
+
+avatar.host=//s.jishutao.com
+
+avatar.upload.host=//s.jishutao.com/upload