java/laboratory.git

parent: ea18460b | 补丁 | 提交 | ignore whitespace

xuhy

昨天 c45c2087783863d127f38aa8fc8a3dcc0acd744f

配置修改

4个文件已删除

4个文件已修改

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MsgUtils.java	70 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/FileUploaderConfig.java	67 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/resources/application-prod.yml	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/resources/application-test.yml	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java	79 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -15,17 +15,17 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.web.controller.tool.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;

/**
 * 登录验证
@@ -50,8 +50,6 @@
    private TokenService tokenService;
    @Autowired
    private ISysRoleService roleService;
    @Autowired
    private MsgUtils msgUtils;

    /**
     * 账号密码登录
@@ -116,23 +114,23 @@
     * @param phone 手机号
     * @return 结果
     */
    @ApiOperation(value = "获取验证码",notes = "获取验证码")
    @GetMapping("/getCode")
    public AjaxResult getCode(@RequestParam String phone)
    {
        // 发送验证码并存储到redis
        if (StringUtils.hasLength(phone)) {
            String code = String.valueOf((int) (Math.random() * 1000000));
            redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
            try {
                msgUtils.sendMsg(phone, code);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            return AjaxResult.success("发送短信验证码成功！5分钟内有效");
        }
        return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
    }
//    @ApiOperation(value = "获取验证码",notes = "获取验证码")
//    @GetMapping("/getCode")
//    public AjaxResult getCode(@RequestParam String phone)
//    {
//        // 发送验证码并存储到redis
//        if (StringUtils.hasLength(phone)) {
//            String code = String.valueOf((int) (Math.random() * 1000000));
//            redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
//            try {
//                msgUtils.sendMsg(phone, code);
//            } catch (Exception e) {
//                throw new RuntimeException(e);
//            }
//            return AjaxResult.success("发送短信验证码成功！5分钟内有效");
//        }
//        return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
//    }

    /**
     * 获取用户信息

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MsgUtils.java

File was deleted

 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/FileUploaderConfig.java

File was deleted

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -202,36 +202,5 @@
    prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
wx:
  conf:
    appId: wxe91f1af7638aa5dd
    secretId: a787e1a462715604e0c9528b6d8960d1
#OSS及短信配置
code:
  config:
    templateCodeTest: "SMS_154950909"
    signNameTest: "阿里云短信测试"
    accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt
    accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
    signName: "四川金达通信工程"
    templateCode: "SMS_293985284"
cos:
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
    location: /xizang
sms:
  enable: true
  appId: 1400957506
  secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
  secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
  sign: 畅云出行
com:
  taxi591:
    bank:
      cer-path: /usr/local/bank/TrustPay.cer
      base-url: http://hello.enjoy.abchina.com
      enable: true
      keystore-password: gggs6666
      pfx-path: /usr/local/bank/103882597000441.pfx
    appId:
    secretId:

 ruoyi-admin/src/main/resources/application-test.yml

@@ -191,41 +191,7 @@
    qrLocation: /file/qrCode/
    accessPath: /file/
    allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar
  url:
#    prefix: http://localhost:${server.port}${server.servlet.context-path}
    prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
wx:
  conf:
    appId: wxe91f1af7638aa5dd
    secretId: a787e1a462715604e0c9528b6d8960d1
#OSS及短信配置
code:
  config:
    templateCodeTest: "SMS_154950909"
    signNameTest: "阿里云短信测试"
    accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt
    accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
    signName: "四川金达通信工程"
    templateCode: "SMS_293985284"
cos:
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
    location: /xizang
sms:
  enable: true
  appId: 1400957506
  secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
  secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
  sign: 畅云出行
com:
  taxi591:
    bank:
      cer-path: D:\workspaces\工作文件\畅云\农业银行\正式\TrustPay.cer
      base-url: http://hello.enjoy.abchina.com
      enable: true
      keystore-password: gggs6666
      pfx-path: D:\workspaces\工作文件\畅云\农业银行\正式\103882597000441.pfx
    appId:
    secretId:

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,17 +1,12 @@
package com.ruoyi.web.controller.system;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SmsUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.web.controller.tool.MsgUtils;

 ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java

File was deleted

			@@ -15,17 +15,17 @@
			import com.ruoyi.framework.web.service.TokenService;
			import com.ruoyi.system.service.ISysMenuService;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.web.controller.tool.MsgUtils;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.util.CollectionUtils;
			import org.springframework.util.StringUtils;
			import org.springframework.web.bind.annotation.*;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RestController;

			import java.util.List;
			import java.util.Set;
			import java.util.concurrent.TimeUnit;

			/**
			* 登录验证
			@@ -50,8 +50,6 @@
			private TokenService tokenService;
			@Autowired
			private ISysRoleService roleService;
			@Autowired
			private MsgUtils msgUtils;

			/**
			* 账号密码登录
			@@ -116,23 +114,23 @@
			* @param phone 手机号
			* @return 结果
			*/
			@ApiOperation(value = "获取验证码",notes = "获取验证码")
			@GetMapping("/getCode")
			public AjaxResult getCode(@RequestParam String phone)
			{
			// 发送验证码并存储到redis
			if (StringUtils.hasLength(phone)) {
			String code = String.valueOf((int) (Math.random() * 1000000));
			redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
			try {
			msgUtils.sendMsg(phone, code);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			return AjaxResult.success("发送短信验证码成功！5分钟内有效");
			}
			return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
			}
			// @ApiOperation(value = "获取验证码",notes = "获取验证码")
			// @GetMapping("/getCode")
			// public AjaxResult getCode(@RequestParam String phone)
			// {
			// // 发送验证码并存储到redis
			// if (StringUtils.hasLength(phone)) {
			// String code = String.valueOf((int) (Math.random() * 1000000));
			// redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
			// try {
			// msgUtils.sendMsg(phone, code);
			// } catch (Exception e) {
			// throw new RuntimeException(e);
			// }
			// return AjaxResult.success("发送短信验证码成功！5分钟内有效");
			// }
			// return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
			// }

			/**
			* 获取用户信息

			@@ -202,36 +202,5 @@
			prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
			wx:
			conf:
			appId: wxe91f1af7638aa5dd
			secretId: a787e1a462715604e0c9528b6d8960d1
			#OSS及短信配置
			code:
			config:
			templateCodeTest: "SMS_154950909"
			signNameTest: "阿里云短信测试"
			accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt
			accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
			signName: "四川金达通信工程"
			templateCode: "SMS_293985284"
			cos:
			client:
			accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
			secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
			bucket: xzgttest-1305134071
			bucketAddr: ap-chengdu
			rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
			location: /xizang
			sms:
			enable: true
			appId: 1400957506
			secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
			secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
			sign: 畅云出行
			com:
			taxi591:
			bank:
			cer-path: /usr/local/bank/TrustPay.cer
			base-url: http://hello.enjoy.abchina.com
			enable: true
			keystore-password: gggs6666
			pfx-path: /usr/local/bank/103882597000441.pfx
			appId:
			secretId:

			@@ -191,41 +191,7 @@
			qrLocation: /file/qrCode/
			accessPath: /file/
			allowExt: .jpg\|.png\|.gif\|.jpeg\|.doc\|.docx\|.apk\|.MP4\|.mp4\|.pdf\|.PDF\|.xls\|.xlsx\|.rar\|.zip\|.rar
			url:
			# prefix: http://localhost:${server.port}${server.servlet.context-path}
			prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
			wx:
			conf:
			appId: wxe91f1af7638aa5dd
			secretId: a787e1a462715604e0c9528b6d8960d1
			#OSS及短信配置
			code:
			config:
			templateCodeTest: "SMS_154950909"
			signNameTest: "阿里云短信测试"
			accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt
			accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
			signName: "四川金达通信工程"
			templateCode: "SMS_293985284"
			cos:
			client:
			accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
			secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
			bucket: xzgttest-1305134071
			bucketAddr: ap-chengdu
			rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
			location: /xizang
			sms:
			enable: true
			appId: 1400957506
			secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
			secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
			sign: 畅云出行
			com:
			taxi591:
			bank:
			cer-path: D:\workspaces\工作文件\畅云\农业银行\正式\TrustPay.cer
			base-url: http://hello.enjoy.abchina.com
			enable: true
			keystore-password: gggs6666
			pfx-path: D:\workspaces\工作文件\畅云\农业银行\正式\103882597000441.pfx
			appId:
			secretId:

			@@ -1,17 +1,12 @@
			package com.ruoyi.web.controller.system;

			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.Set;
			import java.util.concurrent.TimeUnit;

			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.core.domain.model.LoginUserApplet;
			import com.ruoyi.common.core.redis.RedisCache;
			import com.ruoyi.common.utils.SmsUtil;
			import com.ruoyi.framework.web.service.TokenService;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.web.controller.tool.MsgUtils;