Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0 into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -28,15 +28,13 @@ public class LoginController extends WebBaseController{
 	@Autowired
 	private QywxCorpApiService qywxCorpApiService;
 	
-	public static final  String siteId = "ww7d6566614055cf27";
-	
-	public static final String redirectUri = "https://www.gicdev.com/haoban-manage3-web/login";
 	
 	@Autowired
 	private Config config;
 	
 	@RequestMapping("login")
 	public HaobanResponse login(String code) {
+		String siteId = config.getSuiteId();
 		String userId = qywxCorpApiService.getUserInfoSimple(siteId,code);
 		StaffDTO loginStaff = staffApiService.selectByUserId(userId);
 
@@ -53,6 +51,7 @@ public class LoginController extends WebBaseController{
 	@RequestMapping("get-login-qrcode")
 	public HaobanResponse getLoginQrcode(){
 		String corpid = config.getCorpid();
+		String redirectUri = config.getHost() + "login";
 		String url = "https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid="+corpid+"&redirectUri="+redirectUri+"&state=web_login@gyoss9&usertype=admin";
 		//String url = qywxCorpApiService.getGrantAuthorizationUrl(siteId, redirectUri);
 		return resultResponse(HaoBanErrCode.ERR_1,url);