Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/notice/until/NoticeUntil.java

@@ -65,7 +65,7 @@ public class NoticeUntil {
                 "  \"申请前台\": \"能力申请\"," +
                 "  \"上架前台\": \"能力上架\"," +
                 "  \"下架前台\": \"能力下架\"," +
-                "  \"需求前台\": \"需求评论\"," +
+                "  \"需求前台\": \"能力需求\"," +
                 "  \"评论前台\": \"需求评论\"," +
                 "  \"会议室前台\": \"会议室前台\"" +
                 "}";

renren-admin/src/main/resources/application-prod.yml

@@ -68,4 +68,9 @@ synchro:
 # 前端地址入口，门户和管理端
 front:
   portal-url: http://15.72.183.90:7008
-  manage-url: http://15.72.183.90:8001
+  manage-url: http://15.72.183.90:8001
+
+zsk:
+  url:
+    sign: https://cms.qingdao.gov.cn:31479/api-gateway/jpaas-jags-server/interface/createsign.do
+    gateway: https://cms.qingdao.gov.cn:31479/api-gateway/jpaas-jags-server/interface/gateway