Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/common/constanst/Constanst.java

@@ -0,0 +1,16 @@
+package com.template.common.constanst;
+
+/**
+ * <p>Title: Constanst</p>
+ * <p>Description: 系统所用到的常量 </p>
+ * @author fengyong
+ * @date 2018年9月7日
+ */
+public class Constanst {
+	
+	/**
+	 * 自定义加密措施
+	 */
+	public static final String PWD_MD5 = "FeNG#@YOnG";
+
+}

src/main/java/com/template/common/utils/JWTUtil.java

@@ -7,6 +7,7 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.template.model.pojo.RepairAdmin;
+import com.template.model.pojo.SmartUser;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
@@ -31,7 +32,7 @@ public class JWTUtil {
      * 生成token 有过期时间
      * @return 返回token
      */
-    public static String getToken(RepairAdmin ra){
+    public static String getToken(SmartUser user){
 
         // 签发时间
         Date iatDate = new Date();
@@ -46,8 +47,7 @@ public class JWTUtil {
         map.put("typ", "JWT");
         String token = JWT.create()
                 .withHeader(map) // header
-                .withClaim("account", ra.getAccount()) // 账号
-                .withClaim("password", ra.getPassword()) // 密码
+                .withClaim("cardNo", user.getCardNo()) // 账号
                 .withExpiresAt(new Date(CommonUtil.getCurrentTimestamp() + EXPIRED)) // 设置过期时间。过期时间要大于签发时间
                 .withIssuedAt(iatDate) // 设置签发时间
                 .sign(Algorithm.HMAC256(SIGNATURE)); // 加密
@@ -86,8 +86,6 @@ public class JWTUtil {
         return JWT.require(Algorithm.HMAC256(SIGNATURE)).build().verify(token);
     }
 
-
-
     /*
      * 解密Token
      * */

src/main/java/com/template/controller/LoginController.java

@@ -4,7 +4,7 @@ import com.template.annotation.PassToken;
 import com.template.api.LoginControllerAPI;
 import com.template.model.enumModel.eStatu;
 import com.template.model.pojo.RepairAdmin;
-import com.template.model.request.changePasswordRequest;
+import com.template.model.pojo.SmartUser;
 import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.LoginVO;
@@ -106,8 +106,8 @@ public class LoginController implements LoginControllerAPI {
         if(!encPassword.equals(result.getPassword())){
             return CommonResult.fail("密码错误");
         }
-
-        String token = JWTUtil.getToken(result);
+        SmartUser user = new SmartUser();
+        String token = JWTUtil.getToken(user);
         LoginVO login = new LoginVO();
         login.setToken(token);
         login.setTokenTtl(JWTUtil.getExpired());
@@ -128,7 +128,7 @@ public class LoginController implements LoginControllerAPI {
      * @return
      */
     @Override
-    public CommonResult ChangePassword(changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
+    public CommonResult ChangePassword(com.repair.model.request.changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);

src/main/java/com/template/controller/WechatScanLoginController.java

@@ -107,7 +107,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 	@Override
 	public String bindUserMac(String cardNo) throws UnsupportedEncodingException {
 		if (StringUtils.isBlank(cardNo)){
-			return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请输入卡号", "UTF-8");
+			return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("请绑定信息", "UTF-8");
 		}
 		Map<String, String> wechatLoginUrl = wechatScanLoginService.wechatBindUrl(cardNo);
 		String url = wechatLoginUrl.get("url");
@@ -122,37 +122,39 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 			// 验证state为了用于防止跨站请求伪造攻击
 			String decrypt = AesUtil.decrypt(AesUtil.parseHexStr2Byte(state), AesUtil.PASSWORD_SECRET_KEY, 16);
 			if (!decrypt.equals(Constanst.PWD_MD5 + DateUtils.getYYYYMMdd())) {
-				return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请勿非法进入", "UTF-8");
+				return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("请勿非法进入", "UTF-8");
 			}
 			AccessToken access = wechatScanLoginService.getAccessToken(code);
 			if (access != null) {
 				String openid = access.getOpenid();
-				SmartUser user = wechatScanLoginService.selectByOpenid(openid);
-				// 我只是给个例子
-				if (user!=null) {		/*不存在*/
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请勿重复绑定", "UTF-8");
-				}
+				/*SmartUser user = wechatScanLoginService.selectByOpenid(openid);
+				if (user!=null) {		*//*不存在*//*
+					return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("该卡号已绑定其他用户", "UTF-8");
+				}*/
 				SmartUser userc = wechatScanLoginService.selectByCardNo(cardNo);
 				if (userc==null){
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("未查询到用户信息", "UTF-8");
+					return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("卡号信息错误", "UTF-8");
 				}
 				if (userc.getOpenId()!=null){
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请勿重复绑定", "UTF-8");
+					return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("该卡号已绑定其他用户", "UTF-8");
 				}
 				userc.setOpenId(openid);
 				int m = wechatScanLoginService.updateSmartUser(userc);
 				if (m>0){
 					String token = JWTUtil.getToken(userc);
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/index/?token=" + token;
+					return "redirect:"+HttpParame.FRONT_URI+"/#/wanzai/home?token=" + token;
 				}
 			}
 		}
-		return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("绑定失败", "UTF-8");
+		return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("系统异常", "UTF-8");
 	}
 
 	@Override
 	@PassToken
     public String insertMonthMeter(String month){
+		if (month==null){
+			month=TimeExchange2.getMonth();
+		}
 		wechatScanLoginService.insertMonthMeter(month);
 		return "插入完毕";
 	}
@@ -160,6 +162,9 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 	@Override
 	@PassToken
 	public String insertDayMeter(String day){
+		if (day==null){
+			day=TimeExchange2.getDateStr();
+		}
 		wechatScanLoginService.insertDayMeter(day);
 		return "插入完毕";
 	}
@@ -225,7 +230,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 	}
 
 	/**
-	 * Description: 实时抄表
+	 * Description: 区域能耗统计
 	 */
 	@Override
 	@PassToken

src/main/resources/application.properties

@@ -0,0 +1,6 @@
+appid=wxa46ef222053a1047
+secret=16f74a1265c314fd79fdf90670173467
+redirect_uri=https://www.campussmartlife.com/smartApi/wanzai/api/wechat/callback
+bind_uri=https://www.campussmartlife.com/smartApi/wanzai/api/wechat/bindcallback
+openid=null
+access_token=null