完成移动端登录功能

pom.xml

@@ -84,6 +84,7 @@
         <ten.sdk.sms.version>3.1.455</ten.sdk.sms.version>
         <tomcat.embed.core.version>9.0.72</tomcat.embed.core.version>
         <jts.version>1.13</jts.version>
+        <pagehelper>1.3.0</pagehelper>
     </properties>
 
     <modules>
@@ -183,7 +184,7 @@
             <!-- snowy-plugin-dev -->
             <dependency>
                 <groupId>com.unis</groupId>
-            <artifactId>unis-plugin-dev</artifactId>
+                <artifactId>unis-plugin-dev</artifactId>
                 <version>${unis.version}</version>
             </dependency>
 
@@ -668,6 +669,13 @@
                 <version>${jts.version}</version>
             </dependency>
             <!--geo end-->
+
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

unis-common/src/main/java/com/unis/common/util/RsaSecretUtils.java

@@ -0,0 +1,358 @@
+package com.unis.common.util;
+ 
+import javax.crypto.Cipher;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+ 
+/**
+ * @description: Rsa非对称加密算法工具类
+ * @author: chenwenrui
+ * @date: 2023/7/14 15:14
+ */
+public final class RsaSecretUtils {
+    private RsaSecretUtils() {
+    }
+ 
+    private static final String RSA = "RSA";
+ 
+    private static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+ 
+    private static final Base64.Decoder DECODER = Base64.getDecoder();
+ 
+    private static final Base64.Encoder ENCODER = Base64.getEncoder();
+ 
+ 
+    public static void main(String[] args) throws NoSuchAlgorithmException {
+        String plaintext = "de123";
+
+        // 生成密钥对
+        KeyPair keyPair = getKeyPair();
+        // 公匙
+        String publicKey = getPublicKeyBase64(keyPair);
+        System.out.println("公匙 -> " + publicKey);
+        // 私匙
+        String privateKey = getPrivateKeyBase64(keyPair);
+        System.out.println("私匙 -> " + privateKey);
+        // 明文
+
+        System.out.println("明文 -> " + plaintext);
+        // 密文base64（公匙加密）
+        String ciphertext = publicKeyEncrypt(plaintext, publicKey);
+        System.out.println("密文base64 -> " + ciphertext);
+        // 解密后明文（私匙解密）
+        String decryptString = privateKeyDecrypt(ciphertext, privateKey);
+        System.out.println("解密后明文 -> " + decryptString);
+     /*   // 数字签名
+        String sign = sign(ciphertext, privateKey);
+        System.out.println("数字签名 -> " + decryptString);
+        // 验证签名
+        boolean pass = verify(ciphertext, sign, publicKey);
+        System.out.println("验证签名 -> " + pass);*/
+    }
+ 
+ 
+    /**
+     * 生成秘钥对
+     *
+     * @return
+     * @throws Exception
+     */
+    public static KeyPair getKeyPair() throws NoSuchAlgorithmException {
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(RSA);
+        keyPairGenerator.initialize(2048);
+        return keyPairGenerator.generateKeyPair();
+    }
+ 
+    /**
+     * 获取公钥(Base64编码)
+     *
+     * @param keyPair 秘钥对
+     * @return
+     */
+    public static String getPublicKeyBase64(KeyPair keyPair) {
+        PublicKey publicKey = keyPair.getPublic();
+        byte[] bytes = publicKey.getEncoded();
+        // 先用base64编码，再转换为字符串
+        return new String(ENCODER.encode(bytes), StandardCharsets.UTF_8);
+    }
+ 
+    /**
+     * 获取私钥(Base64编码)
+     *
+     * @param keyPair 秘钥对
+     * @return
+     */
+    public static String getPrivateKeyBase64(KeyPair keyPair) {
+        PrivateKey privateKey = keyPair.getPrivate();
+        byte[] bytes = privateKey.getEncoded();
+        // 先用base64编码，再转换为字符串
+        return new String(ENCODER.encode(bytes), StandardCharsets.UTF_8);
+    }
+ 
+    /**
+     * 将Base64编码后的公钥转换成PublicKey对象
+     *
+     * @param publicKeyBase64 公钥base64
+     * @return
+     */
+    public static PublicKey getPublicKey(String publicKeyBase64) throws NoSuchAlgorithmException, InvalidKeySpecException {
+        byte[] keyBytes = DECODER.decode(publicKeyBase64);
+        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA);
+        return keyFactory.generatePublic(keySpec);
+    }
+ 
+    /**
+     * 将Base64编码后的私钥转换成PrivateKey对象
+     *
+     * @param privateKeyBase64 私钥base64
+     * @return
+     * @throws Exception
+     */
+    public static PrivateKey getPrivateKey(String privateKeyBase64) throws NoSuchAlgorithmException, InvalidKeySpecException {
+        byte[] keyBytes = DECODER.decode((privateKeyBase64));
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA);
+        return keyFactory.generatePrivate(keySpec);
+    }
+ 
+    /**
+     * 公钥加密
+     *
+     * @param plaintext       明文
+     * @param publicKeyBase64 公钥base64
+     * @return 密文数组base64编码后的字符串
+     */
+    public static String publicKeyEncrypt(String plaintext, String publicKeyBase64) {
+        try {
+            // 获取明文字节数组
+            byte[] bytes = plaintext.getBytes(StandardCharsets.UTF_8);
+            Cipher cipher = Cipher.getInstance(RSA);
+            // 编码前设定编码方式及密钥
+            PublicKey publicKey = getPublicKey(publicKeyBase64);
+            cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+            int keyBit = getKeySize(publicKey);
+            int inputLen = bytes.length;
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            int offSet = 0;
+            int step = keyBit / 8 - 11;
+            for (int i = 0; inputLen - offSet > 0; offSet = i * step) {
+                byte[] cache;
+                if (inputLen - offSet > step) {
+                    cache = cipher.doFinal(bytes, offSet, step);
+                } else {
+                    cache = cipher.doFinal(bytes, offSet, inputLen - offSet);
+                }
+                out.write(cache, 0, cache.length);
+                ++i;
+            }
+            // 密文字节数组
+            byte[] ciphertextBytes = out.toByteArray();
+            out.close();
+            // 返回密文字节数组base64编码后的字符串
+            return new String(ENCODER.encode(ciphertextBytes), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+ 
+    /**
+     * 公钥解密
+     *
+     * @param ciphertext      密文
+     * @param publicKeyBase64 公钥base64
+     * @return 明文
+     */
+    public static String publicKeyDecrypt(String ciphertext, String publicKeyBase64) {
+        try {
+            // 密文base64解码字节数组
+            byte[] bytes = DECODER.decode(ciphertext.getBytes(StandardCharsets.UTF_8));
+            Cipher cipher = Cipher.getInstance(RSA);
+            PublicKey publicKey = getPublicKey(publicKeyBase64);
+            cipher.init(Cipher.DECRYPT_MODE, publicKey);
+            int keyBit = getKeySize(publicKey);
+            int inputLen = bytes.length;
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            int offSet = 0;
+            int step = keyBit / 8;
+ 
+            for (int i = 0; inputLen - offSet > 0; offSet = i * step) {
+                byte[] cache;
+                if (inputLen - offSet > step) {
+                    cache = cipher.doFinal(bytes, offSet, step);
+                } else {
+                    cache = cipher.doFinal(bytes, offSet, inputLen - offSet);
+                }
+                out.write(cache, 0, cache.length);
+                ++i;
+            }
+            // 明文字节数组
+            byte[] plaintextBytes = out.toByteArray();
+            out.close();
+            return new String(plaintextBytes, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+ 
+    /**
+     * 私钥加密
+     *
+     * @param plaintext        明文
+     * @param privateKeyBase64 私钥base64
+     * @return
+     */
+    public static String privateKeyEncrypt(String plaintext, String privateKeyBase64) {
+        try {
+            // 获取明文字节数组
+            byte[] bytes = plaintext.getBytes(StandardCharsets.UTF_8);
+            Cipher cipher = Cipher.getInstance(RSA);
+            // 编码前设定编码方式及密钥
+            PrivateKey privateKey = getPrivateKey(privateKeyBase64);
+            cipher.init(Cipher.ENCRYPT_MODE, privateKey);
+            int keyBit = getKeySize(privateKey);
+            int inputLen = bytes.length;
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            int offSet = 0;
+            int step = keyBit / 8 - 11;
+ 
+            for (int i = 0; inputLen - offSet > 0; offSet = i * step) {
+                byte[] cache;
+                if (inputLen - offSet > step) {
+                    cache = cipher.doFinal(bytes, offSet, step);
+                } else {
+                    cache = cipher.doFinal(bytes, offSet, inputLen - offSet);
+                }
+                out.write(cache, 0, cache.length);
+                ++i;
+            }
+            // 密文字节数组
+            byte[] ciphertextBytes = out.toByteArray();
+            out.close();
+            // 返回密文字节数组base64编码后的字符串
+            return new String(ENCODER.encode(ciphertextBytes), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+ 
+    /**
+     * 私钥解密
+     *
+     * @param ciphertext       密文
+     * @param privateKeyBase64 私钥base64
+     * @return 明文
+     */
+    public static String privateKeyDecrypt(String ciphertext, String privateKeyBase64) {
+        try {
+            // 密文base64解码字节数组
+            byte[] bytes = DECODER.decode(ciphertext.getBytes(StandardCharsets.UTF_8));
+            Cipher cipher = Cipher.getInstance(RSA);
+            PrivateKey privateKey = getPrivateKey(privateKeyBase64);
+            cipher.init(Cipher.DECRYPT_MODE, privateKey);
+            int keyBit = getKeySize(privateKey);
+            int inputLen = bytes.length;
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            int offSet = 0;
+            int step = keyBit / 8;
+ 
+            for (int i = 0; inputLen - offSet > 0; offSet = i * step) {
+                byte[] cache;
+                if (inputLen - offSet > step) {
+                    cache = cipher.doFinal(bytes, offSet, step);
+                } else {
+                    cache = cipher.doFinal(bytes, offSet, inputLen - offSet);
+                }
+                out.write(cache, 0, cache.length);
+                ++i;
+            }
+            // 明文字节数组
+            byte[] plaintextBytes = out.toByteArray();
+            out.close();
+            return new String(plaintextBytes, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+ 
+    /**
+     * 使用私钥对数据进行数字签名
+     *
+     * @param ciphertext       密文
+     * @param privateKeyBase64 私钥Base64
+     * @return 加密后的base64签名
+     */
+    public static String sign(String ciphertext, String privateKeyBase64) {
+        try {
+            // 密文字节数组
+            byte[] ciphertextBytes = DECODER.decode(ciphertext.getBytes(StandardCharsets.UTF_8));
+            PrivateKey privateKey = getPrivateKey(privateKeyBase64);
+            Signature signature = Signature.getInstance(SIGN_ALGORITHMS);
+            signature.initSign(privateKey);
+            signature.update(ciphertextBytes);
+            byte[] signed = signature.sign();
+            return new String(ENCODER.encode(signed), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+ 
+    /**
+     * 使用公钥验证数字签名
+     *
+     * @param ciphertext      密文
+     * @param sign            签名
+     * @param publicKeyBase64 公钥base64
+     * @return 是否篡改了数据
+     */
+    public static boolean verify(String ciphertext, String sign, String publicKeyBase64) {
+        try {
+            // 密文base64解码字节数组
+            byte[] ciphertextBytes = DECODER.decode(ciphertext.getBytes(StandardCharsets.UTF_8));
+            // 签名base64解码字节数组
+            byte[] signBytes = DECODER.decode(sign.getBytes(StandardCharsets.UTF_8));
+            PublicKey publicKey = getPublicKey(publicKeyBase64);
+            Signature signature = Signature.getInstance(SIGN_ALGORITHMS);
+            signature.initVerify(publicKey);
+            signature.update(ciphertextBytes);
+            return signature.verify(signBytes);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+ 
+    /**
+     * 获取公钥长度
+     *
+     * @param publicKey 公钥
+     * @return
+     */
+    public static int getKeySize(PublicKey publicKey) {
+        RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey;
+        return rsaPublicKey.getModulus().bitLength();
+    }
+ 
+    /**
+     * 获取私钥长度
+     *
+     * @param privateKey 私钥
+     * @return
+     */
+    public static int getKeySize(PrivateKey privateKey) {
+        RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) privateKey;
+        return rsaPrivateKey.getModulus().bitLength();
+    }
+ 
+}

unis-plugin-api/unis-plugin-auth-api/src/main/java/com/unis/auth/api/SaBaseLoginUserApi.java

@@ -121,4 +121,6 @@ public interface SaBaseLoginUserApi {
      * @date 2022/4/27 22:57
      */
     void updateUserLoginInfo(String userId, String device);
+
+
 }

unis-plugin/unis-plugin-auth/pom.xml

@@ -57,5 +57,12 @@
             <groupId>me.zhyd.oauth</groupId>
             <artifactId>JustAuth</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
     </dependencies>
 </project>

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/controller/UserCollectLoginController.java

@@ -0,0 +1,43 @@
+package com.unis.auth.modular.login.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.unis.auth.core.enums.SaClientTypeEnum;
+import com.unis.auth.modular.login.param.AuthAccountPasswordLoginParam;
+import com.unis.auth.modular.login.param.UserCollectPasswordLoginParam;
+import com.unis.auth.modular.login.service.AuthService;
+import com.unis.common.pojo.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 移动端登录管理
+ *
+ * @author weiyinbin
+ * @date 2024/04/02 15:40
+ */
+@Api(tags = "移动端登录管理")
+@ApiSupport(author = "UNIS_TEAM", order = 1)
+@RestController
+@Validated
+public class UserCollectLoginController {
+
+    @Autowired
+    private AuthService authService;
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("移动端登录密码登录")
+    @PostMapping("/auth/c/userCollect/login")
+    public CommonResult<String> doLogin(@RequestBody @Valid UserCollectPasswordLoginParam userCollectPasswordLoginParam) {
+        return CommonResult.data(authService.userLogin(userCollectPasswordLoginParam));
+    }
+
+
+}

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/entity/UserCollectLogin.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.auth.modular.login.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * C端用户-采集人员实体
+ *
+ * @author hujinachun
+ * @date  2024/04/10 14:17
+ **/
+@Getter
+@Setter
+@TableName("biz_user_collect")
+public class UserCollectLogin {
+
+    /** ID */
+    @TableId
+    @ApiModelProperty(value = "ID", position = 1)
+    private Long id;
+
+    /** 删除标志 */
+    @ApiModelProperty(value = "删除标志", position = 2)
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    private String deleteFlag;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间", position = 3)
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /** 创建用户 */
+    @ApiModelProperty(value = "创建用户", position = 4)
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    /** 修改时间 */
+    @ApiModelProperty(value = "修改时间", position = 5)
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    /** 修改用户 */
+    @ApiModelProperty(value = "修改用户", position = 6)
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateUser;
+
+    /** 人员姓名 */
+    @ApiModelProperty(value = "人员姓名", position = 7)
+    private String name;
+
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号", position = 8)
+    private String phone;
+
+    /** 联系地址 */
+    @ApiModelProperty(value = "联系地址", position = 9)
+    private String address;
+
+    /** 密码 */
+    @ApiModelProperty(value = "密码", position = 10)
+    private String password;
+}

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/mapper/UserCollectLoginMapper.java

@@ -0,0 +1,15 @@
+package com.unis.auth.modular.login.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.unis.auth.modular.login.entity.UserCollectLogin;
+
+/**
+ * @author hujiangchun
+ * @version 1.0
+ * @Title
+ * @ProjectName
+ * @Description
+ * @date 2024/4/10 16:29
+ */
+public interface UserCollectLoginMapper extends BaseMapper<UserCollectLogin> {
+}

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/param/UserCollectPasswordLoginParam.java

@@ -0,0 +1,40 @@
+package com.unis.auth.modular.login.param;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @author hujiangchun
+ * @version 1.0
+ * @Title
+ * @ProjectName
+ * @Description
+ * @date 2024/4/10 15:04
+ */
+@Getter
+@Setter
+public class UserCollectPasswordLoginParam {
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码", position = 10)
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号", position = 8)
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+
+}

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/service/AuthService.java

@@ -19,6 +19,7 @@ import com.unis.auth.core.pojo.SaBaseLoginUser;
 import com.unis.auth.modular.login.param.AuthAccountPasswordLoginParam;
 import com.unis.auth.modular.login.param.AuthGetPhoneValidCodeParam;
 import com.unis.auth.modular.login.param.AuthPhoneValidCodeLoginParam;
+import com.unis.auth.modular.login.param.UserCollectPasswordLoginParam;
 import com.unis.auth.modular.login.result.AuthPicValidCodeResult;
 
 /**
@@ -84,4 +85,11 @@ public interface AuthService {
      * @date 2022/7/9 14:44
      */
     String doLoginById(String userId, String device, String type);
+/**
+ * @author: hujianchun
+ * @Description:
+ * @param:
+ * @return: 移动端手机号密码登录
+*/
+    String userLogin(UserCollectPasswordLoginParam userCollectPasswordLoginParam);
 }

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/service/impl/AuthServiceImpl.java

@@ -23,6 +23,7 @@ import cn.hutool.core.util.PhoneUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.unis.auth.api.SaBaseLoginUserApi;
 import com.unis.auth.core.enums.SaClientTypeEnum;
@@ -31,6 +32,12 @@ import com.unis.auth.core.pojo.SaBaseLoginUser;
 import com.unis.auth.core.util.StpClientLoginUserUtil;
 import com.unis.auth.core.util.StpClientUtil;
 import com.unis.auth.core.util.StpLoginUserUtil;
+import com.unis.auth.modular.login.entity.UserCollectLogin;
+import com.unis.auth.modular.login.mapper.UserCollectLoginMapper;
+import com.unis.auth.modular.login.param.UserCollectPasswordLoginParam;
+import com.unis.auth.modular.login.utils.JwtTokenUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.unis.auth.api.SaBaseLoginUserApi;
 import com.unis.auth.core.enums.SaClientTypeEnum;
@@ -55,6 +62,7 @@ import com.unis.dev.api.DevSmsApi;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -63,6 +71,7 @@ import java.util.stream.Collectors;
  * @author xuyuxiang
  * @date 2021/12/23 21:52
  */
+@Slf4j
 @Service
 public class AuthServiceImpl implements AuthService {
 
@@ -78,6 +87,9 @@ public class AuthServiceImpl implements AuthService {
     @Resource(name = "clientLoginUserApi")
     private SaBaseLoginUserApi clientLoginUserApi;
 
+    @Autowired
+    private UserCollectLoginMapper userCollectLoginMapper;
+
     @Resource
     private DevConfigApi devConfigApi;
 
@@ -124,7 +136,6 @@ public class AuthServiceImpl implements AuthService {
         String phoneValidCodeReqNo = IdWorker.getIdStr();
 
 
-
         // TODO 使用阿里云执行发送验证码，将验证码作为短信内容的参数变量放入，
         // TODO 签名不传则使用系统默认配置的签名，支持传入多个参数，示例：{"name":"张三","number":"15038****76"}
         //devSmsApi.sendSmsAliyun(phone, null, "验证码模板号", JSONUtil.toJsonStr(JSONUtil.createObj().set("validCode", phoneValidCode)));
@@ -148,17 +159,17 @@ public class AuthServiceImpl implements AuthService {
     private void validValidCode(String phoneOrEmail, String validCode, String validCodeReqNo) {
         // 依据请求号，取出缓存中的验证码进行校验
         Object existValidCode;
-        if(ObjectUtil.isEmpty(phoneOrEmail)) {
+        if (ObjectUtil.isEmpty(phoneOrEmail)) {
             existValidCode = commonCacheOperator.get(AUTH_VALID_CODE_CACHE_KEY + validCodeReqNo);
         } else {
             existValidCode = commonCacheOperator.get(AUTH_VALID_CODE_CACHE_KEY + phoneOrEmail + StrUtil.UNDERLINE + validCodeReqNo);
         }
         // 为空则直接验证码错误
-        if(ObjectUtil.isEmpty(existValidCode)) {
+        if (ObjectUtil.isEmpty(existValidCode)) {
             throw new CommonException(AuthExceptionEnum.VALID_CODE_ERROR.getValue());
         }
         // 移除该验证码
-        if(ObjectUtil.isEmpty(phoneOrEmail)) {
+        if (ObjectUtil.isEmpty(phoneOrEmail)) {
             commonCacheOperator.remove(AUTH_VALID_CODE_CACHE_KEY + validCodeReqNo);
         } else {
             commonCacheOperator.remove(AUTH_VALID_CODE_CACHE_KEY + phoneOrEmail + StrUtil.UNDERLINE + validCodeReqNo);
@@ -177,23 +188,23 @@ public class AuthServiceImpl implements AuthService {
      **/
     private void validPhoneValidCodeParam(String phoneOrEmail, String validCode, String validCodeReqNo, String type) {
         // 验证码正确则校验手机号格式
-        if(ObjectUtil.isEmpty(phoneOrEmail)) {
+        if (ObjectUtil.isEmpty(phoneOrEmail)) {
             // 执行校验验证码
             validValidCode(null, validCode, validCodeReqNo);
         } else {
-            if(!PhoneUtil.isMobile(phoneOrEmail) && !CommonEmailUtil.isEmail(phoneOrEmail)) {
+            if (!PhoneUtil.isMobile(phoneOrEmail) && !CommonEmailUtil.isEmail(phoneOrEmail)) {
                 throw new CommonException(AuthExceptionEnum.PHONE_FORMAT_ERROR.getValue());
             }
             // 执行校验验证码
             validValidCode(phoneOrEmail, validCode, validCodeReqNo);
 
             // 根据手机号获取用户信息，判断用户是否存在，根据B端或C端判断
-            if(SaClientTypeEnum.B.getValue().equals(type)) {
-                if(ObjectUtil.isEmpty(loginUserApi.getUserByPhone(phoneOrEmail))) {
+            if (SaClientTypeEnum.B.getValue().equals(type)) {
+                if (ObjectUtil.isEmpty(loginUserApi.getUserByPhone(phoneOrEmail))) {
                     throw new CommonException(AuthExceptionEnum.PHONE_ERROR.getValue());
                 }
             } else {
-                if(ObjectUtil.isEmpty(clientLoginUserApi.getClientUserByPhone(phoneOrEmail))) {
+                if (ObjectUtil.isEmpty(clientLoginUserApi.getClientUserByPhone(phoneOrEmail))) {
                     throw new CommonException(AuthExceptionEnum.PHONE_ERROR.getValue());
                 }
             }
@@ -211,25 +222,25 @@ public class AuthServiceImpl implements AuthService {
         // 获取设备
         String device = authAccountPasswordLoginParam.getDevice();
         // 默认指定为PC，如在小程序跟移动端的情况下，自行指定即可
-        if(ObjectUtil.isEmpty(device)) {
+        if (ObjectUtil.isEmpty(device)) {
             device = AuthDeviceTypeEnum.PC.getValue();
         } else {
             AuthDeviceTypeEnum.validate(device);
         }
         // 校验验证码
         String defaultCaptchaOpen = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_KEY);
-        if(ObjectUtil.isNotEmpty(defaultCaptchaOpen)) {
-            if(Convert.toBool(defaultCaptchaOpen)) {
+        if (ObjectUtil.isNotEmpty(defaultCaptchaOpen)) {
+            if (Convert.toBool(defaultCaptchaOpen)) {
                 // 获取验证码
                 String validCode = authAccountPasswordLoginParam.getValidCode();
                 // 获取验证码请求号
                 String validCodeReqNo = authAccountPasswordLoginParam.getValidCodeReqNo();
                 // 开启验证码则必须传入验证码
-                if(ObjectUtil.isEmpty(validCode)) {
+                if (ObjectUtil.isEmpty(validCode)) {
                     throw new CommonException(AuthExceptionEnum.VALID_CODE_EMPTY.getValue());
                 }
                 // 开启验证码则必须传入验证码请求号
-                if(ObjectUtil.isEmpty(validCodeReqNo)) {
+                if (ObjectUtil.isEmpty(validCodeReqNo)) {
                     throw new CommonException(AuthExceptionEnum.VALID_CODE_REQ_NO_EMPTY.getValue());
                 }
                 // 执行校验验证码
@@ -245,9 +256,9 @@ public class AuthServiceImpl implements AuthService {
             throw new CommonException(AuthExceptionEnum.PWD_DECRYPT_ERROR.getValue());
         }
         // 根据账号获取用户信息，根据B端或C端判断
-        if(SaClientTypeEnum.B.getValue().equals(type)) {
+        if (SaClientTypeEnum.B.getValue().equals(type)) {
             SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByAccount(account);
-            if(ObjectUtil.isEmpty(saBaseLoginUser)) {
+            if (ObjectUtil.isEmpty(saBaseLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
             if (!saBaseLoginUser.getPassword().equals(passwordHash)) {
@@ -261,7 +272,7 @@ public class AuthServiceImpl implements AuthService {
             return execLoginB(saBaseLoginUser, device);
         } else {
             SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByAccount(account);
-            if(ObjectUtil.isEmpty(saBaseClientLoginUser)) {
+            if (ObjectUtil.isEmpty(saBaseClientLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
             if (!saBaseClientLoginUser.getPassword().equals(passwordHash)) {
@@ -281,22 +292,22 @@ public class AuthServiceImpl implements AuthService {
         // 设备
         String device = authPhoneValidCodeLoginParam.getDevice();
         // 默认指定为PC，如在小程序跟移动端的情况下，自行指定即可
-        if(ObjectUtil.isEmpty(device)) {
+        if (ObjectUtil.isEmpty(device)) {
             device = AuthDeviceTypeEnum.PC.getValue();
         } else {
             AuthDeviceTypeEnum.validate(device);
         }
         // 根据手机号获取用户信息，根据B端或C端判断
-        if(SaClientTypeEnum.B.getValue().equals(type)) {
+        if (SaClientTypeEnum.B.getValue().equals(type)) {
             SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByPhone(phone);
-            if(ObjectUtil.isEmpty(saBaseLoginUser)) {
+            if (ObjectUtil.isEmpty(saBaseLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
             // 执行B端登录
             return execLoginB(saBaseLoginUser, device);
         } else {
             SaBaseClientLoginUser saBaseClientLoginUser = clientLoginUserApi.getClientUserByPhone(phone);
-            if(ObjectUtil.isEmpty(saBaseClientLoginUser)) {
+            if (ObjectUtil.isEmpty(saBaseClientLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
             // 执行C端登录
@@ -313,25 +324,25 @@ public class AuthServiceImpl implements AuthService {
         long disableTime = StpUtil.getDisableTime(userAccount);
         if (disableTime > 0) {
             if (disableTime > 60) {
-                throw new CommonException(userAccount + "账号已被封禁, 请再"+ disableTime/60+ "分钟后重新尝试登录!!");
+                throw new CommonException(userAccount + "账号已被封禁, 请再" + disableTime / 60 + "分钟后重新尝试登录!!");
             }
-            throw new CommonException(userAccount + "账号已被封禁, 请再"+ disableTime+ "秒后重新尝试登录!!");
+            throw new CommonException(userAccount + "账号已被封禁, 请再" + disableTime + "秒后重新尝试登录!!");
         }
     }
 
     // redis中保存登录错误次数
-    private void saveLoginTimes(String userAccount){
+    private void saveLoginTimes(String userAccount) {
         String loginErrorKey = LOGIN_ERROR_TIMES_KEY_PREFIX + userAccount;
         Integer number = (Integer) commonCacheOperator.get(loginErrorKey);
         if (number == null) {
             // 如果redis中没有保存，代表失败第一次
             number = 2;
-            commonCacheOperator.put(loginErrorKey, number,5 * 60);
+            commonCacheOperator.put(loginErrorKey, number, 5 * 60);
             return;
         }
         if (number < 5) {
             number++;
-            commonCacheOperator.put(loginErrorKey, number,5 * 60);
+            commonCacheOperator.put(loginErrorKey, number, 5 * 60);
             return;
         }
         // 第五次封禁账号,第六次进入isDisableTime方法，返回用户还需等待时间
@@ -343,6 +354,7 @@ public class AuthServiceImpl implements AuthService {
 
     /**
      * 登录成功、清空登录次数
+     *
      * @param userAccount 账号
      */
     private void clearLoginErrorTimes(String userAccount) {
@@ -359,7 +371,7 @@ public class AuthServiceImpl implements AuthService {
      **/
     private String execLoginB(SaBaseLoginUser saBaseLoginUser, String device) {
         // 校验状态
-        if(!saBaseLoginUser.getEnabled()) {
+        if (!saBaseLoginUser.getEnabled()) {
             throw new CommonException(AuthExceptionEnum.ACCOUNT_DISABLED.getValue());
         }
 
@@ -399,7 +411,7 @@ public class AuthServiceImpl implements AuthService {
      **/
     private String execLoginC(SaBaseClientLoginUser saBaseClientLoginUser, String device) {
         // 校验状态
-        if(!saBaseClientLoginUser.getEnabled()) {
+        if (!saBaseClientLoginUser.getEnabled()) {
             throw new CommonException(AuthExceptionEnum.ACCOUNT_DISABLED.getValue());
         }
         // 执行登录
@@ -463,7 +475,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public String doLoginById(String userId, String device, String type) {
         // 根据id获取用户信息，根据B端或C端判断
-        if(SaClientTypeEnum.B.getValue().equals(type)) {
+        if (SaClientTypeEnum.B.getValue().equals(type)) {
             SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserById(userId);
             if (ObjectUtil.isEmpty(saBaseLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
@@ -479,4 +491,57 @@ public class AuthServiceImpl implements AuthService {
             return execLoginC(saBaseClientLoginUser, device);
         }
     }
+
+    /**
+     * @author: hujianchun
+     * @Description:
+     * @param:
+     * @return: 移动端手机号密码登录
+     */
+    @Override
+    public String userLogin(UserCollectPasswordLoginParam userCollectPasswordLoginParam) {
+
+        // 手机号
+        String phone = userCollectPasswordLoginParam.getPhone();
+        //加密的密码
+        String password = userCollectPasswordLoginParam.getPassword();
+        //SM2密码解密
+        String passwordStr;
+        try {
+            passwordStr = CommonCryptogramUtil.doSm2Decrypt(password);
+
+        } catch (Exception e) {
+            log.error("SM2密码解密失败，请检查前端公钥,堆栈信息[{}]", e.getMessage());
+            throw new CommonException(AuthExceptionEnum.PWD_DECRYPT_ERROR.getValue());
+        }
+
+        List<UserCollectLogin> userCollectLogins = userCollectLoginMapper.selectList(new LambdaQueryWrapper<UserCollectLogin>()
+                .eq(UserCollectLogin::getPhone, phone));
+        if (CollectionUtil.isEmpty(userCollectLogins)) {
+            //返回用户信息
+            throw new CommonException(AuthExceptionEnum.PHONE_ERROR.getValue());
+        }
+
+        //有手机号，就进行密码校验
+        UserCollectLogin userCollectLogin = userCollectLogins.get(0);
+        if (!Objects.equals(userCollectLogin.getPassword(), passwordStr)) {
+            return AuthExceptionEnum.PWD_ERROR.getValue();
+
+        }
+      /*  try {
+            //执行登录
+            // 缓存用户信息，此处使用TokenSession为了指定时间内无操作则自动下线
+            StpClientUtil.login(userCollectLogin.getId(), new SaLoginModel().setExtra("name", userCollectLogin.getName()));
+            StpClientUtil.getTokenSession().set("loginUserToken", userCollectLogins);
+        } catch (Exception e) {
+            log.error("缓存失败");
+            throw new RuntimeException(e);
+        }*/
+
+        // 返回token
+        return JwtTokenUtils.createToken(userCollectLogin,50000);
+
+
+
+    }
 }

unis-plugin/unis-plugin-auth/src/main/java/com/unis/auth/modular/login/utils/JwtTokenUtils.java

@@ -0,0 +1,85 @@
+package com.unis.auth.modular.login.utils;
+
+import cn.hutool.jwt.Claims;
+import com.unis.auth.modular.login.entity.UserCollectLogin;
+import com.unis.auth.modular.login.param.UserCollectPasswordLoginParam;
+import io.jsonwebtoken.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JwtTokenUtils {
+
+    //用于签名的私钥
+    private static final String PRIVATE_KEY = "17CS3Flight";
+    //签发者
+    private static final String ISS = "qinghailiangshi";
+
+    //过期时间1小时
+    private static final long EXPIRATION_ONE_HOUR = 3600L;
+    //过期时间1天
+    private static final long EXPIRATION_ONE_DAY = 604800L;
+
+    /**
+     * 生成Token
+     * @param user
+     * @return
+     */
+    public static String createToken(UserCollectLogin user, int expireTimeType){
+        //过期时间
+        long expireTime = 0;
+        if (expireTimeType == 0){
+            expireTime = EXPIRATION_ONE_HOUR;
+        }else {
+            expireTime = EXPIRATION_ONE_DAY;
+        }
+
+        //Jwt头
+        Map<String,Object> header = new HashMap<>();
+        header.put("typ","JWT");
+        header.put("alg","HS256");
+        Map<String,Object> claims = new HashMap<>();
+        //自定义有效载荷部分
+        claims.put("id",user.getId());
+        claims.put("userName",user.getName());
+
+        return Jwts.builder()
+                //发证人
+                .setIssuer(ISS)
+                //Jwt头
+                .setHeader(header)
+                //有效载荷
+                .setClaims(claims)
+                //设定签发时间
+                .setIssuedAt(new Date())
+                //设定过期时间
+                .setExpiration(new Date(System.currentTimeMillis() + expireTime * 1000))
+                //使用HS256算法签名，PRIVATE_KEY为签名密钥
+                .signWith(SignatureAlgorithm.HS256,PRIVATE_KEY)
+                .compact();
+    }
+
+
+    /**
+     * 获取有效载荷
+     * @param token
+     * @return
+     */
+    public static Claims getClaimsFromToken(String token){
+        Claims claims = null;
+        try {
+            claims = (Claims) Jwts.parser()
+                    //设定解密私钥
+                    .setSigningKey(PRIVATE_KEY)
+                    //传入Token
+                    .parseClaimsJws(token)
+                    //获取载荷类
+                    .getBody();
+        }catch (Exception e){
+            return null;
+        }
+        return claims;
+    }
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/pricemonitor/param/PriceMonitorIdParam.java

@@ -30,6 +30,6 @@ public class PriceMonitorIdParam {
 
     /** ID */
     @ApiModelProperty(value = "ID", required = true)
-    @NotBlank(message = "id不能为空")
+   // @NotBlank(message = "id不能为空")
     private String id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/pricemonitor/param/PriceMonitorPageParam.java

@@ -48,4 +48,10 @@ public class PriceMonitorPageParam {
     @ApiModelProperty(value = "关键词")
     private String searchKey;
 
+    @ApiModelProperty(value = "监测点名称")
+    private String name;
+
+    @ApiModelProperty(value = "所属行政部门")
+    private String sysOrgId;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/remindcycle/entity/RemindCycle.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import java.math.BigDecimal;
+import java.time.LocalTime;
 import java.util.Date;
 
 /**

unis-plugin/unis-plugin-client/src/main/java/com/unis/client/modular/user/provider/ClientLoginUserApiProvider.java

@@ -173,4 +173,5 @@ public class ClientLoginUserApiProvider implements SaBaseLoginUserApi {
     public void updateUserLoginInfo(String userId, String device) {
         clientUserService.updateUserLoginInfo(userId, device);
     }
+
 }

unis-web-app/src/main/java/com/unis/core/config/GlobalConfigure.java

@@ -122,6 +122,8 @@ public class GlobalConfigure implements WebMvcConfigurer {
             "/auth/c/getPhoneValidCode",
             "/auth/c/doLogin",
             "/auth/c/doLoginByPhone",
+            "/auth/c/userCollect/login",
+
 
             "/auth/b/getPicCaptcha",
             "/auth/b/getPhoneValidCode",