productDev/lianhelihua_sh.git

jiangping

2025-04-23 eff9f8dce083c7ef911cb8419c03baf3af176c68

代码初始化

已修改6个文件

	admin/.env.test	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/lianhelihua_admin/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/api/common/PublicCloudController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/core/utils/FtpUtil.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/.env.test

@@ -4,4 +4,4 @@
# 关闭DEBUG
VUE_APP_DEBUG = 'off'

VUE_APP_API_URL  = 'https://dmtest.ahapp.net/lianhelihua_interface'
VUE_APP_API_URL  = 'https://test.doumee.cn/lianhelihua_interface'

 admin/lianhelihua_admin/index.html

@@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>联合利华事件上报系统</title><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.0e03d457.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js"></script><script src="/lianhelihua_admin/static/js/app.0e03d457.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>联合利华事件上报系统</title><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.7e6411c1.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js"></script><script src="/lianhelihua_admin/static/js/app.7e6411c1.js"></script></body></html>

 server/src/main/java/com/doumee/api/common/PublicCloudController.java

@@ -101,6 +101,7 @@
                for (MultipartFile file :fileList) {
                    //获得每一个文件
                    String originname = file.getOriginalFilename();
                    log.error("【上传FTP成功】=============开始========="+index+"===="+originname);
                    InputStream is = file.getInputStream();
                    String endType = originname.substring(originname.lastIndexOf("."), originname.length());
                    String date = DateUtil.getNowShortDate();
@@ -120,6 +121,7 @@
                        fileJSON.put("originname", originname);
                        jsonArray.add(fileJSON);
                    }
                    log.error("【上传FTP成功】=============结束========="+index+"====="+r+"===="+fName);
                    index = index + 1;
                }
                context.put("data",jsonArray);

 server/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java

@@ -22,8 +22,7 @@
@Component
@Slf4j
public class JwtTokenUtil {

    public static final String HEADER_KEY = "web_token";
    public static final String HEADER_KEY = "web-token";
//    @Autowired
//    private RedisTemplate<String,Object> redisTemplate;


 server/src/main/java/com/doumee/core/utils/FtpUtil.java

@@ -469,7 +469,7 @@
                    if (ftpClient.makeDirectory(subDirectory)) {
                        ftpClient.changeWorkingDirectory(subDirectory);
                    } else {
                        System.out.println("创建目录失败");
                        log.error("创建目录失败subDirectory=："+subDirectory);
                        return "2";
                        // return UploadStatus.Create_Directory_Fail;
                    }

 server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java

@@ -156,7 +156,7 @@
     * @param <T>
     */
    public static   <T> QywxBaseResponse<T> sendHttpRequest(String url, String name, String param, TypeReference<QywxBaseResponse<T>> typeReference){
        log.info("【"+name+"】================开始===="+ JSONObject.toJSONString(param));
        log.info("【"+name+"】================开始===="+url+"\nparam==========================:"+ JSONObject.toJSONString(param));
        if ( StringUtils.isNotBlank(url)) {
            String res = null;
            try {

			@@ -4,4 +4,4 @@
			# 关闭DEBUG
			VUE_APP_DEBUG = 'off'

			VUE_APP_API_URL = 'https://dmtest.ahapp.net/lianhelihua_interface'
			VUE_APP_API_URL = 'https://test.doumee.cn/lianhelihua_interface'

			@@ -1 +1 @@
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>联合利华事件上报系统</title><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.0e03d457.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.174acd1e.js"></script><script src="/lianhelihua_admin/static/js/app.0e03d457.js"></script></body></html>
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>联合利华事件上报系统</title><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.7e6411c1.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.f4542b62.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.fd387514.js"></script><script src="/lianhelihua_admin/static/js/app.7e6411c1.js"></script></body></html>

			@@ -101,6 +101,7 @@
			for (MultipartFile file :fileList) {
			//获得每一个文件
			String originname = file.getOriginalFilename();
			log.error("【上传FTP成功】=============开始========="+index+"===="+originname);
			InputStream is = file.getInputStream();
			String endType = originname.substring(originname.lastIndexOf("."), originname.length());
			String date = DateUtil.getNowShortDate();
			@@ -120,6 +121,7 @@
			fileJSON.put("originname", originname);
			jsonArray.add(fileJSON);
			}
			log.error("【上传FTP成功】=============结束========="+index+"====="+r+"===="+fName);
			index = index + 1;
			}
			context.put("data",jsonArray);

			@@ -22,8 +22,7 @@
			@Component
			@Slf4j
			public class JwtTokenUtil {

			public static final String HEADER_KEY = "web_token";
			public static final String HEADER_KEY = "web-token";
			// @Autowired
			// private RedisTemplate<String,Object> redisTemplate;

			@@ -469,7 +469,7 @@
			if (ftpClient.makeDirectory(subDirectory)) {
			ftpClient.changeWorkingDirectory(subDirectory);
			} else {
			System.out.println("创建目录失败");
			log.error("创建目录失败subDirectory=："+subDirectory);
			return "2";
			// return UploadStatus.Create_Directory_Fail;
			}

			@@ -156,7 +156,7 @@
			* @param <T>
			*/
			public static <T> QywxBaseResponse<T> sendHttpRequest(String url, String name, String param, TypeReference<QywxBaseResponse<T>> typeReference){
			log.info("【"+name+"】================开始===="+ JSONObject.toJSONString(param));
			log.info("【"+name+"】================开始===="+url+"\nparam==========================:"+ JSONObject.toJSONString(param));
			if ( StringUtils.isNotBlank(url)) {
			String res = null;
			try {