zhba/zhba_management_w_bf.git

parent: c273bf2f | patch | commit | ignore whitespace

zhongrj

2023-09-09 336eb40668bc45199f305be4b6241e9b2d872086

二维码ip地址更换

6 files modified

1 files added

	src/main/java/org/springblade/common/config/QrcodeConfig.java	24 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/qrcode/QrCodeController.java	16 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-dev.yml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-test.yml	4 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/org/springblade/common/config/QrcodeConfig.java

New file
@@ -0,0 +1,24 @@
package org.springblade.common.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

/**
 * 二维码 配置路径
 * @author zhongrj
 * @since 2023-9-9
 */
@ConfigurationProperties(prefix = "qrcode")
@Component
public class QrcodeConfig {

    /**
     * 基础路径（ip+端口）
     */
    public static String baseUrl;


    public void setBaseUrl(String baseUrl) {
        QrcodeConfig.baseUrl = baseUrl;
    }
}

 src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.accreditation.excel.ExportSecurityBookPaperExcel;
@@ -173,7 +174,7 @@
                //如果保安证编号不为空
                if (null != accreditationRecordsVo.getSecurityNumber() && accreditationRecordsVo.getSecurityNumber() != "") {
                    //去生成二维码
                    String url = "http://61.131.136.25:2080/securityInfo.html";
                    String url = QrcodeConfig.baseUrl + "securityInfo.html";
                    String encoded = null;
                    try {
                        encoded = URLEncoder.encode(accreditationRecordsVo.getSecurityNumber(), "UTF-8");

 src/main/java/org/springblade/modules/qrcode/QrCodeController.java

@@ -2,6 +2,7 @@

import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
@@ -45,17 +46,10 @@
     */
    @GetMapping("/getQrCode")
    public ResponseEntity<byte[]> getQrCode(String securityNumber) throws UnsupportedEncodingException {
//        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
        String url = "http://61.131.136.25:2080/securityInfo.html";
        String url = QrcodeConfig.baseUrl + "securityInfo.html";
        if (null!=securityNumber) {
            String encoded = URLEncoder.encode(securityNumber,"UTF-8");
            String content = url + "?securityNumber=" + encoded;
//                "&realName=" + one.getRealName() +
//                "&age=" + one.getAge() +
//                "&sex=" + one.getSex() +
//                "&avatar=" + one.getAvatar() +
//                "&deptName=" + one.getDeptName();


            ResponseEntity<byte[]> aEntity = null;
            try {
@@ -84,8 +78,7 @@
     */
    @GetMapping("/getQrCodeBase64")
    public String getQrCodeBase64(String securityNumber) throws Exception{
//        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
        String url = "http://61.131.136.25:2080/securityInfo.html";
        String url = QrcodeConfig.baseUrl + "securityInfo.html";
        if (null!=securityNumber) {
            String encoded = URLEncoder.encode(securityNumber,"UTF-8");
            String content = url + "?securityNumber=" + encoded;
@@ -104,8 +97,7 @@
     */
    @GetMapping("/getQrCodeDown")
    public String getQrCodeDown(String securityNumber) throws Exception{
//        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
        String url = "http://61.131.136.25:2080/securityInfo.html";
        String url = QrcodeConfig.baseUrl + "securityInfo.html";
        if (null!=securityNumber) {
            String encoded = URLEncoder.encode(securityNumber,"UTF-8");
            String content = url + "?securityNumber=" + encoded;

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -24,6 +24,7 @@
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
@@ -1552,7 +1553,7 @@
     */
    @Override
    public void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId) {
        String url = "http://61.131.136.25:2080/securityInfo.html";
        String url = QrcodeConfig.baseUrl + "securityInfo.html";
        //二维码生成
        data.forEach(qrCodeExcel -> {
            if (null!=qrCodeExcel.getSecuritynumber()) {

 src/main/resources/application-dev.yml

@@ -98,5 +98,9 @@
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html

# 二维码
qrcode:
  baseUrl: http://60.220.177.113:2081/




 src/main/resources/application-prod.yml

@@ -98,5 +98,9 @@
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html

# 二维码
qrcode:
  baseUrl: http://60.220.177.113:2081/




 src/main/resources/application-test.yml

@@ -102,5 +102,7 @@
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html


# 二维码
qrcode:
  baseUrl: http://60.220.177.113:2081/

New file
			@@ -0,0 +1,24 @@
			package org.springblade.common.config;

			import org.springframework.boot.context.properties.ConfigurationProperties;
			import org.springframework.stereotype.Component;

			/**
			* 二维码配置路径
			* @author zhongrj
			* @since 2023-9-9
			*/
			@ConfigurationProperties(prefix = "qrcode")
			@Component
			public class QrcodeConfig {

			/**
			* 基础路径（ip+端口）
			*/
			public static String baseUrl;


			public void setBaseUrl(String baseUrl) {
			QrcodeConfig.baseUrl = baseUrl;
			}
			}

			@@ -4,6 +4,7 @@
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import lombok.AllArgsConstructor;
			import org.springblade.common.config.QrcodeConfig;
			import org.springblade.common.utils.QRCodeUtil;
			import org.springblade.modules.FTP.FtpUtil;
			import org.springblade.modules.accreditation.excel.ExportSecurityBookPaperExcel;
			@@ -173,7 +174,7 @@
			//如果保安证编号不为空
			if (null != accreditationRecordsVo.getSecurityNumber() && accreditationRecordsVo.getSecurityNumber() != "") {
			//去生成二维码
			String url = "http://61.131.136.25:2080/securityInfo.html";
			String url = QrcodeConfig.baseUrl + "securityInfo.html";
			String encoded = null;
			try {
			encoded = URLEncoder.encode(accreditationRecordsVo.getSecurityNumber(), "UTF-8");

			@@ -2,6 +2,7 @@

			import com.google.zxing.WriterException;
			import lombok.AllArgsConstructor;
			import org.springblade.common.config.QrcodeConfig;
			import org.springblade.common.utils.QRCodeUtil;
			import org.springblade.core.mp.support.Condition;
			import org.springblade.core.tool.api.R;
			@@ -45,17 +46,10 @@
			*/
			@GetMapping("/getQrCode")
			public ResponseEntity<byte[]> getQrCode(String securityNumber) throws UnsupportedEncodingException {
			// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
			String url = "http://61.131.136.25:2080/securityInfo.html";
			String url = QrcodeConfig.baseUrl + "securityInfo.html";
			if (null!=securityNumber) {
			String encoded = URLEncoder.encode(securityNumber,"UTF-8");
			String content = url + "?securityNumber=" + encoded;
			// "&realName=" + one.getRealName() +
			// "&age=" + one.getAge() +
			// "&sex=" + one.getSex() +
			// "&avatar=" + one.getAvatar() +
			// "&deptName=" + one.getDeptName();


			ResponseEntity<byte[]> aEntity = null;
			try {
			@@ -84,8 +78,7 @@
			*/
			@GetMapping("/getQrCodeBase64")
			public String getQrCodeBase64(String securityNumber) throws Exception{
			// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
			String url = "http://61.131.136.25:2080/securityInfo.html";
			String url = QrcodeConfig.baseUrl + "securityInfo.html";
			if (null!=securityNumber) {
			String encoded = URLEncoder.encode(securityNumber,"UTF-8");
			String content = url + "?securityNumber=" + encoded;
			@@ -104,8 +97,7 @@
			*/
			@GetMapping("/getQrCodeDown")
			public String getQrCodeDown(String securityNumber) throws Exception{
			// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
			String url = "http://61.131.136.25:2080/securityInfo.html";
			String url = QrcodeConfig.baseUrl + "securityInfo.html";
			if (null!=securityNumber) {
			String encoded = URLEncoder.encode(securityNumber,"UTF-8");
			String content = url + "?securityNumber=" + encoded;

			@@ -24,6 +24,7 @@
			import lombok.AllArgsConstructor;
			import org.apache.commons.lang3.StringUtils;
			import org.springblade.common.cache.SysCache;
			import org.springblade.common.config.QrcodeConfig;
			import org.springblade.common.constant.AgeUtil;
			import org.springblade.common.constant.CommonConstant;
			import org.springblade.common.constant.TenantConstant;
			@@ -1552,7 +1553,7 @@
			*/
			@Override
			public void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId) {
			String url = "http://61.131.136.25:2080/securityInfo.html";
			String url = QrcodeConfig.baseUrl + "securityInfo.html";
			//二维码生成
			data.forEach(qrCodeExcel -> {
			if (null!=qrCodeExcel.getSecuritynumber()) {

			@@ -98,5 +98,9 @@
			upload-domain: http://localhost:8999
			remote-path: /usr/share/nginx/html

			# 二维码
			qrcode:
			baseUrl: http://60.220.177.113:2081/

			@@ -102,5 +102,7 @@
			upload-domain: http://localhost:8999
			remote-path: /usr/share/nginx/html


			# 二维码
			qrcode:
			baseUrl: http://60.220.177.113:2081/