|
@@ -21,6 +21,7 @@ import com.template.services.PermissionSettingService;
|
|
|
import com.template.services.UsersService;
|
|
import com.template.services.UsersService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.http.HttpEntity;
|
|
import org.springframework.http.HttpEntity;
|
|
|
import org.springframework.http.HttpHeaders;
|
|
import org.springframework.http.HttpHeaders;
|
|
|
import org.springframework.http.MediaType;
|
|
import org.springframework.http.MediaType;
|
|
@@ -49,6 +50,9 @@ public class AppletLoginController implements AppletLoginControllerAPI {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
PermissionSettingService permissionSettingService;
|
|
PermissionSettingService permissionSettingService;
|
|
|
|
|
|
|
|
|
|
+ @Value("${image.url}")
|
|
|
|
|
+ private String url;
|
|
|
|
|
+
|
|
|
public static void main(String[] args) throws UnsupportedEncodingException {
|
|
public static void main(String[] args) throws UnsupportedEncodingException {
|
|
|
String name ="\u571f\u6728\u5efa\u7b51\u5206\u9662";
|
|
String name ="\u571f\u6728\u5efa\u7b51\u5206\u9662";
|
|
|
String encodeName = URLEncoder.encode(name,"utf-8");
|
|
String encodeName = URLEncoder.encode(name,"utf-8");
|
|
@@ -193,11 +197,11 @@ public class AppletLoginController implements AppletLoginControllerAPI {
|
|
|
log.info("adminMenuId= "+adminMenuId);
|
|
log.info("adminMenuId= "+adminMenuId);
|
|
|
|
|
|
|
|
// System.out.println("重定向路径=" + "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head);
|
|
// System.out.println("重定向路径=" + "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head);
|
|
|
- return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager+"&head_image="+headImage+"&OrgIds="+OrgIds+"&parentId="+parentId;
|
|
|
|
|
|
|
+ return "redirect:"+url+ "/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager+"&head_image="+headImage+"&OrgIds="+OrgIds+"&parentId="+parentId;
|
|
|
// return "redirect:"+ "http://192.168.161.33:8000/hotel/h5/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
|
|
// return "redirect:"+ "http://192.168.161.33:8000/hotel/h5/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
- return "redirect:" + "https://chtech.ncjti.edu.cn/hotel/h5/#/error/?errorMsg=" + URLEncoder.encode("获取用户信息失败", "utf-8");
|
|
|
|
|
|
|
+ return "redirect:" +url+ "/h5/#/error/?errorMsg=" + URLEncoder.encode("获取用户信息失败", "utf-8");
|
|
|
// return "redirect:" + "http://192.168.161.33:8000/hotel/h5/#/error/?errorMsg=" + URLEncoder.encode("获取用户信息失败", "utf-8");
|
|
// return "redirect:" + "http://192.168.161.33:8000/hotel/h5/#/error/?errorMsg=" + URLEncoder.encode("获取用户信息失败", "utf-8");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|