Merge branch 'dev'

王言钊
2 parents bdd2edbd 982e9940
Showing 3 changed files with 10 additions and 7 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -34,19 +34,19 @@ public class ShenheApplication extends SpringBootServletInitializer {
      * 本机的名称
      */
     @Value("${SERVER_NAME}")
-    private  String SERVER_NAME ;
+    private  String SERVER_NAME;
     /**
      * 登录入口
      */
     @Value("${SERVICE_LOGIN}")
-    private  String SERVICE_LOGIN ;
+    private  String SERVICE_LOGIN;
     /**
      * 登出
      */
     @Value("${SERVICE_LOGINOUT}")
-    private  String SERVICE_LOGINOUT ;
+    private  String SERVICE_LOGINOUT;
     public static void main(String[] args) {
         SpringApplicationBuilder builder = new SpringApplicationBuilder(ShenheApplication.class);
@@ -48,8 +48,11 @@ public class UsersController extends BaseController {
     @Value("${SERVICE_LOGIN}")
     private  String SERVICE_LOGIN ;
+    /**
+     * 本机的名称
+     */
     @Value("${spring.localhost.url}")
-    private String redirecpageturl;
+    private  String redirectURL ;
     @GetMapping(value = "/{id}")
     @ResponseBody
@@ -77,7 +80,7 @@ public class UsersController extends BaseController {
                 sessionUser.setLogo(user.getUser_logo());
                 sessionUser.setMaster(user.getMaster());
                 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
-                return "redirect:"+redirecpageturl+"/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
+                return "redirect:"+redirectURL+"/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
             }
         }
         return "page/error.html";
@@ -86,7 +89,7 @@ public class UsersController extends BaseController {
     @RequestMapping("/logout")
     public String logout(HttpSession session) {
         session.invalidate();
-        return "redirect:https://user.cnlive.com/OpenSSO2/logout?service=http://shen.cnlive.com/users/login";
+        return "redirect:https://user.cnlive.com/OpenSSO2/logout?service="+SERVICE_LOGIN;
     }
@@ -190,7 +190,7 @@ public class VideosController extends BaseController {
                         videos.setSpid_desc(shySites.getName() + "(目击者)");
                         String source1 = videos.getSource();
                         for (ShyActivity activity : activityList) {
-                            if (activity.getId().equals(Integer.valueOf(source1))) {
+                            if (String.valueOf(activity.getId()).equals(source1)) {
                                 videos.setSpid_desc(activity.getActivity());
                                 break;
                             }