From fe467f6c6be0b8b1cc47d2cdef66503fcfc59e7d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 25 五月 2021 17:47:51 +0800
Subject: [PATCH] add:网格综治app、后台登陆
---
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java | 18 +++
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java | 16 +++
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java | 59 +++++++++++
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/model/vos/LoginBody.java | 25 +++++
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/model/vos/LoginBody.java | 25 +++++
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 28 +++++
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java | 59 +++++++++++
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 41 ++++++++
9 files changed, 272 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
index f4c77aa..d2086c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -143,4 +143,32 @@
return R.ok(loginReturnVO);
}
+
+ /**
+ * 网格综治APP登录
+ *
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginGridApp")
+ public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginGridApp(account, password);
+ return R.ok(loginReturnVO);
+ }
+
+
+ /**
+ * 网格综治后台登录
+ *
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginGridBackstage")
+ public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
+ return R.ok(loginReturnVO);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
index f2aae2a..29e5bca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -56,4 +56,20 @@
* @date 2021-5-13 10:56
*/
LoginReturnVO loginBigDataBackStage(String account, String password);
+
+ /**
+ * 网格综治APP登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginGridApp(String account, String password);
+
+ /**
+ * 网格综治后台登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginGridBackstage(String account, String password);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
index dfd4782..f7b19ea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -147,4 +147,45 @@
return loginReturnVO;
}
+ /**
+ * 商家后台登录
+ *
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginGridApp(String account, String password) {
+ Authentication authentication = null;
+ authentication = authenticationManager
+ .authenticate(new UsernamePasswordAuthenticationToken(account+"_6", password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO=new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 商家后台登录
+ *
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginGridBackstage(String account, String password) {
+ Authentication authentication = null;
+ authentication = authenticationManager
+ .authenticate(new UsernamePasswordAuthenticationToken(account+"_7", password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO=new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
index b967100..de217b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -63,4 +63,22 @@
*/
@PostMapping("/loginShopBackStage")
R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password")String password);
+
+ /**
+ * 网格综治APP登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginGridApp")
+ R loginGridApp(@RequestParam("account") String account, @RequestParam("password")String password);
+
+ /**
+ * 网格综治后台登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginGridBackstage")
+ R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password")String password);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
new file mode 100644
index 0000000..b9e9f84
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
@@ -0,0 +1,59 @@
+package com.panzhihua.grid_app.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.auth.TokenService;
+import com.panzhihua.grid_app.model.vos.LoginBody;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author cedoo
+ */
+@RestController
+@RequestMapping("/")
+@Api(tags = {"网格综治APP登录模块"})
+public class LoginApi extends BaseController {
+ @Resource
+ private TokenService tokenService;
+
+ @ApiOperation(value = "网格综治APP登录",response = LoginReturnVO.class)
+ @PostMapping("login")
+ public R login(@RequestBody LoginBody loginBody){
+ String account = loginBody.getAccount();
+ String password = loginBody.getPassword();
+ boolean empty = ObjectUtils.isEmpty(account);
+ boolean empty1 = ObjectUtils.isEmpty(password);
+ if (empty||empty1) {
+ return R.fail("账户密码不能为空");
+ }
+ R r = tokenService.loginGridApp(account, password);
+ return r;
+ }
+
+ @ApiOperation(value = "刷新token",response =LoginReturnVO.class)
+ @GetMapping("refreshToken")
+ @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
+ public R refreshToken(@RequestParam("refreshToken")String refreshToken){
+ return tokenService.refreshToken(refreshToken);
+ }
+
+ @ApiOperation(value = "用户登出")
+ @PostMapping("logout")
+ public R logout(){
+ String token = this.getToken();
+ boolean empty2 = ObjectUtils.isEmpty(token);
+ if (empty2) {
+ return R.ok();
+ }
+ return tokenService.logout(token);
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/model/vos/LoginBody.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/model/vos/LoginBody.java
new file mode 100644
index 0000000..e08b783
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/model/vos/LoginBody.java
@@ -0,0 +1,25 @@
+package com.panzhihua.grid_app.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 10:54
+ **/
+@Data
+@ApiModel(value = "网格综治APP登录")
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginBody {
+
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java
new file mode 100644
index 0000000..814e6d6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java
@@ -0,0 +1,59 @@
+package com.panzhihua.grid_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.auth.TokenService;
+import com.panzhihua.grid_backstage.model.vos.LoginBody;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author cedoo
+ */
+@RestController
+@RequestMapping("/")
+@Api(tags = {"网格综治后台登录模块"})
+public class LoginApi extends BaseController {
+ @Resource
+ private TokenService tokenService;
+
+ @ApiOperation(value = "网格综治后台登录",response = LoginReturnVO.class)
+ @PostMapping("login")
+ public R login(@RequestBody LoginBody loginBody){
+ String account = loginBody.getAccount();
+ String password = loginBody.getPassword();
+ boolean empty = ObjectUtils.isEmpty(account);
+ boolean empty1 = ObjectUtils.isEmpty(password);
+ if (empty||empty1) {
+ return R.fail("账户密码不能为空");
+ }
+ R r = tokenService.loginGridBackstage(account, password);
+ return r;
+ }
+
+ @ApiOperation(value = "刷新token",response =LoginReturnVO.class)
+ @GetMapping("refreshToken")
+ @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
+ public R refreshToken(@RequestParam("refreshToken")String refreshToken){
+ return tokenService.refreshToken(refreshToken);
+ }
+
+ @ApiOperation(value = "用户登出")
+ @PostMapping("logout")
+ public R logout(){
+ String token = this.getToken();
+ boolean empty2 = ObjectUtils.isEmpty(token);
+ if (empty2) {
+ return R.ok();
+ }
+ return tokenService.logout(token);
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/model/vos/LoginBody.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/model/vos/LoginBody.java
new file mode 100644
index 0000000..143c637
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/model/vos/LoginBody.java
@@ -0,0 +1,25 @@
+package com.panzhihua.grid_backstage.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 10:54
+ **/
+@Data
+@ApiModel(value = "网格综治后台登录")
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginBody {
+
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java
index 1fb184d..a9e5747 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java
@@ -35,7 +35,7 @@
//RouteLocator可以根据zuul配置的路由列表获取服务
private final RouteLocator routeLocator;
- private String[]ids=new String[]{"appletsbackstage","applets","communitybackstage", "shopbackstage"};
+ private String[]ids=new String[]{"appletsbackstage","applets","communitybackstage", "shopbackstage","gridbackstage", "gridapp"};
public SwaggerConfig(RouteLocator routeLocator) {
this.routeLocator = routeLocator;
--
Gitblit v1.7.1