Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/framework/config/SecurityConfig.java

@@ -107,7 +107,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage", "/business/app/getUpdate", "/snms/**", "/mini/**", "/test/**").permitAll()
+                .antMatchers("/getSupplierByMnemonicCode", "/login", "/register", "/captchaImage", "/business/app/getUpdate", "/snms/**", "/mini/**", "/test/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

src/main/java/cn/ezhizao/framework/security/LoginBody.java

@@ -6,6 +6,7 @@ package cn.ezhizao.framework.security;
  * @author ruoyi
  */
 public class LoginBody {
+    private String mnemonicCode;
     /**
      * 用户名
      */
@@ -33,11 +34,16 @@ public class LoginBody {
      */
     private String uuid;
 
+    public String getMnemonicCode() {
+        return mnemonicCode;
+    }
+    public void setMnemonicCode(String mnemonicCode) {
+        this.mnemonicCode = mnemonicCode;
+    }
 
     public String getUsername() {
         return username;
     }
-
     public void setUsername(String username) {
         this.username = username;
     }
@@ -45,7 +51,6 @@ public class LoginBody {
     public String getPassword() {
         return password;
     }
-
     public void setPassword(String password) {
         this.password = password;
     }
@@ -53,7 +58,6 @@ public class LoginBody {
     public String getCode() {
         return code;
     }
-
     public void setCode(String code) {
         this.code = code;
     }
@@ -61,7 +65,6 @@ public class LoginBody {
     public String getUuid() {
         return uuid;
     }
-
     public void setUuid(String uuid) {
         this.uuid = uuid;
     }
@@ -69,7 +72,6 @@ public class LoginBody {
     public String getTenantId() {
         return tenantId;
     }
-
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }

src/main/java/cn/ezhizao/project/system/controller/SysLoginController.java

@@ -7,6 +7,7 @@ import cn.ezhizao.framework.security.service.SysLoginService;
 import cn.ezhizao.framework.security.service.SysPermissionService;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.domain.BizSupplier;
 import cn.ezhizao.project.business.domain.BizSupplierUser;
 import cn.ezhizao.project.business.service.IBizSupplierService;
 import cn.ezhizao.project.business.service.IBizSupplierUserService;
@@ -34,6 +35,31 @@ public class SysLoginController extends BaseController
     @Resource
     private IBizSupplierService bizSupplierService;
 
+    /**
+     * 根据助记码查询供应商信息
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/getSupplierByMnemonicCode")
+    public AjaxResult getSupplierByMnemonicCode(@RequestBody LoginBody loginBody)
+    {
+        // 正常登录
+        List<BizSupplier> suppliers = bizSupplierService.query().eq("mnemonic_code", loginBody.getMnemonicCode()).list();
+        if (suppliers.isEmpty())
+        {
+            return AjaxResult.error(201, "助记码错误");
+        } else {
+            if (suppliers.size() == 1)
+            {
+                BizSupplier supplier = suppliers.get(0);
+                return AjaxResult.success(supplier);
+            } else {
+                return AjaxResult.error(201, "助记码有误，匹配到多个企业");
+            }
+        }
+    }
+
     /**
      * 登录方法
      *

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -0,0 +1,67 @@
+package cn.ezhizao.project.system.controller;
+
+import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.domain.BizSupplierUser;
+import cn.ezhizao.project.business.service.IBizSupplierUserService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户信息
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController {
+    @Resource
+    private IBizSupplierUserService iBizSupplierUserService;
+
+    @Resource
+    private HttpServletRequest request;
+
+    /**
+     * 获取用户列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(BizSupplierUser user) throws NoSuchFieldException, IllegalAccessException {
+        final String supplierId = request.getHeader("tenantId");
+        List<BizSupplierUser> list = iBizSupplierUserService.query().eq("supplier_id", supplierId).list();
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增或修改用户
+     */
+    @Log(title = "用户修改信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "save")
+    @Transactional
+    public AjaxResult save(@Validated @RequestBody BizSupplierUser data) {
+        BizSupplierUser user = SecurityUtils.getLoginUser().getUser();
+        user.setPassword(SecurityUtils.encryptPassword(data.getPassword()));
+        return toAjax(iBizSupplierUserService.saveOrUpdate(user));
+    }
+    /**
+     * 重置密码
+     */
+    @Log(title = "用户修改密码", businessType = BusinessType.UPDATE)
+    @PostMapping("/resetPwd")
+    public AjaxResult resetPwd(@RequestBody Map<String, Object> data) {
+        BizSupplierUser user = SecurityUtils.getLoginUser().getUser();
+        // String oldPassword = (String) data.get("oldPassword");
+        String newPassword = (String) data.get("newPassword");
+        user.setPassword(SecurityUtils.encryptPassword(newPassword));
+        return toAjax(iBizSupplierUserService.saveOrUpdate(user));
+    }
+}