From 33bc1c13a871e111bdfdd458fe6f9e9ec6452d86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 06:43:53 +0000 Subject: [PATCH 01/15] Bump junit from 4.12 to 4.13.1 in /SpringBootDemoV2 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] --- SpringBootDemoV2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemoV2/pom.xml b/SpringBootDemoV2/pom.xml index 62a7b2a..753a362 100644 --- a/SpringBootDemoV2/pom.xml +++ b/SpringBootDemoV2/pom.xml @@ -73,7 +73,7 @@ junit junit - 4.12 + 4.13.1 From 3c910d3f98dda543a4c924c62f5f1d6b2bd28e48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jan 2021 19:51:10 +0000 Subject: [PATCH 02/15] Bump poi from 3.13 to 3.17 in /SpringBootDemo Bumps poi from 3.13 to 3.17. Signed-off-by: dependabot[bot] --- SpringBootDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemo/pom.xml b/SpringBootDemo/pom.xml index 230a45e..d214501 100644 --- a/SpringBootDemo/pom.xml +++ b/SpringBootDemo/pom.xml @@ -116,7 +116,7 @@ org.apache.poi poi - 3.13 + 3.17 org.apache.poi From 7e7ece10fdf57a0aafcc8d89447dd67b23fb5ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Apr 2021 18:00:31 +0000 Subject: [PATCH 03/15] Bump commons-io from 2.5 to 2.7 in /SpringBootDemo Bumps commons-io from 2.5 to 2.7. Signed-off-by: dependabot[bot] --- SpringBootDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemo/pom.xml b/SpringBootDemo/pom.xml index 230a45e..acb456d 100644 --- a/SpringBootDemo/pom.xml +++ b/SpringBootDemo/pom.xml @@ -99,7 +99,7 @@ commons-io commons-io - 2.5 + 2.7 From e27b2fe67cfa1faa91c3ea50685010378836005d Mon Sep 17 00:00:00 2001 From: jerryoung Date: Sun, 5 Dec 2021 22:15:56 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DInvalid=20bound=20s?= =?UTF-8?q?tatement=20(not=20found)=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xiaour/spring/boot/config/MyBatisConfig.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SpringBootDemo/src/main/java/com/xiaour/spring/boot/config/MyBatisConfig.java b/SpringBootDemo/src/main/java/com/xiaour/spring/boot/config/MyBatisConfig.java index 3e498a6..5b1f78d 100644 --- a/SpringBootDemo/src/main/java/com/xiaour/spring/boot/config/MyBatisConfig.java +++ b/SpringBootDemo/src/main/java/com/xiaour/spring/boot/config/MyBatisConfig.java @@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; /** @@ -38,6 +39,8 @@ public DruidDataSource dataSource() { public SqlSessionFactory sqlSessionFactory() throws Exception { SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean(); sqlSessionFactoryBean.setDataSource(dataSource()); + sqlSessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver() + .getResources(("classpath*:mapper/*.xml"))); return sqlSessionFactoryBean.getObject(); } } From 6b17d8b7e585de0edb1cb51151f94bb8c592ef1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 18:39:54 +0000 Subject: [PATCH 05/15] Bump spring-boot-starter-web in /SpringBootKafkaDemo Bumps [spring-boot-starter-web](https://github.com/spring-projects/spring-boot) from RELEASE to 2.5.12. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/commits/v2.5.12) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootKafkaDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootKafkaDemo/pom.xml b/SpringBootKafkaDemo/pom.xml index 9681f7a..9831ec0 100644 --- a/SpringBootKafkaDemo/pom.xml +++ b/SpringBootKafkaDemo/pom.xml @@ -48,7 +48,7 @@ org.springframework.boot spring-boot-starter-web - RELEASE + 2.5.12 org.springframework From 6ba5f1f1790b2dae147ea1ea0e54b707371aff8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 18:41:26 +0000 Subject: [PATCH 06/15] Bump spring-boot-starter-web in /SpringBootRocketMqDemo Bumps [spring-boot-starter-web](https://github.com/spring-projects/spring-boot) from RELEASE to 2.5.12. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/commits/v2.5.12) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootRocketMqDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootRocketMqDemo/pom.xml b/SpringBootRocketMqDemo/pom.xml index e8cee00..e3cf92d 100644 --- a/SpringBootRocketMqDemo/pom.xml +++ b/SpringBootRocketMqDemo/pom.xml @@ -45,7 +45,7 @@ org.springframework.boot spring-boot-starter-web - RELEASE + 2.5.12 From 566547620588000ff7917a94ea5c70da07a276a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 20:49:52 +0000 Subject: [PATCH 07/15] Bump gson from 2.8.2 to 2.8.9 in /SpringBootKafkaDemo Bumps [gson](https://github.com/google/gson) from 2.8.2 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.2...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootKafkaDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootKafkaDemo/pom.xml b/SpringBootKafkaDemo/pom.xml index 9831ec0..d58c85e 100644 --- a/SpringBootKafkaDemo/pom.xml +++ b/SpringBootKafkaDemo/pom.xml @@ -43,7 +43,7 @@ com.google.code.gson gson - 2.8.2 + 2.8.9 org.springframework.boot From d1a27243307ce66496056d7fc1772516f1e54526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 20:50:32 +0000 Subject: [PATCH 08/15] Bump gson from 2.8.2 to 2.8.9 in /SpringBootDemoV2 Bumps [gson](https://github.com/google/gson) from 2.8.2 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.2...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootDemoV2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemoV2/pom.xml b/SpringBootDemoV2/pom.xml index 753a362..4292c6f 100644 --- a/SpringBootDemoV2/pom.xml +++ b/SpringBootDemoV2/pom.xml @@ -56,7 +56,7 @@ com.google.code.gson gson - 2.8.2 + 2.8.9 From 90f921e26b17d81bfe9f45d8889c2fb83202e8bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 01:56:21 +0000 Subject: [PATCH 09/15] Bump fastjson from 1.2.31 to 1.2.83 in /SpringBootDemo Bumps [fastjson](https://github.com/alibaba/fastjson) from 1.2.31 to 1.2.83. - [Release notes](https://github.com/alibaba/fastjson/releases) - [Commits](https://github.com/alibaba/fastjson/compare/1.2.31...1.2.83) --- updated-dependencies: - dependency-name: com.alibaba:fastjson dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemo/pom.xml b/SpringBootDemo/pom.xml index 94ff1d4..b45311e 100644 --- a/SpringBootDemo/pom.xml +++ b/SpringBootDemo/pom.xml @@ -93,7 +93,7 @@ com.alibaba fastjson - 1.2.31 + 1.2.83 From cbfb987b400aa1e2e6b73fb73913de0e757c2080 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 16:46:21 +0000 Subject: [PATCH 10/15] Bump poi from 3.17 to 4.1.1 in /SpringBootDemo Bumps poi from 3.17 to 4.1.1. --- updated-dependencies: - dependency-name: org.apache.poi:poi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemo/pom.xml b/SpringBootDemo/pom.xml index 94ff1d4..ef7e569 100644 --- a/SpringBootDemo/pom.xml +++ b/SpringBootDemo/pom.xml @@ -116,7 +116,7 @@ org.apache.poi poi - 3.17 + 4.1.1 org.apache.poi From e77ed36cea1d8138f0c5dd76ad49c5a70d4c4632 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:56:37 +0000 Subject: [PATCH 11/15] Bump org.apache.zookeeper:zookeeper in /SpringBootDemoV2 Bumps org.apache.zookeeper:zookeeper from 3.4.11 to 3.7.2. --- updated-dependencies: - dependency-name: org.apache.zookeeper:zookeeper dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootDemoV2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootDemoV2/pom.xml b/SpringBootDemoV2/pom.xml index 4292c6f..a8d66cd 100644 --- a/SpringBootDemoV2/pom.xml +++ b/SpringBootDemoV2/pom.xml @@ -43,7 +43,7 @@ org.apache.zookeeper zookeeper - 3.4.11 + 3.7.2 From ae4fc1d0b524690f81f45c3a245e4b9e90880804 Mon Sep 17 00:00:00 2001 From: "Zhang.Tao" Date: Mon, 20 Nov 2023 13:52:22 +0800 Subject: [PATCH 12/15] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c5d94a1..ae7616d 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ 4.Webflux Spring异步编程，你将发现新大陆(代码已经部分上传，blog完善中...) +5.[利用EasyExcel，两行代码开发一个和API结果一致的生成Excel功能](https://github.com/xiaour/EasyExport#readme) + ## 代码部分 ⭐️ SpringBootDemo From 54fc5c0da0075f4ba0fa17db17daad9ac17cfe41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 22:48:42 +0000 Subject: [PATCH 13/15] Bump org.springframework:spring-context in /SpringBootKafkaDemo Bumps [org.springframework:spring-context](https://github.com/spring-projects/spring-framework) from 5.1.3.RELEASE to 5.2.22.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.1.3.RELEASE...v5.2.22.RELEASE) --- updated-dependencies: - dependency-name: org.springframework:spring-context dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- SpringBootKafkaDemo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootKafkaDemo/pom.xml b/SpringBootKafkaDemo/pom.xml index d58c85e..60bf559 100644 --- a/SpringBootKafkaDemo/pom.xml +++ b/SpringBootKafkaDemo/pom.xml @@ -53,7 +53,7 @@ org.springframework spring-context - 5.1.3.RELEASE + 5.2.22.RELEASE From 01862bbdd3339113bf71384a063c5adc8bcf05de Mon Sep 17 00:00:00 2001 From: zhangtao Date: Wed, 6 Mar 2024 18:36:27 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpringBootDemo/pom.xml | 12 +- SpringBootDemoV2/pom.xml | 16 +- .../java/com/github/xiaour/Application.java | 3 +- .../github/xiaour/controller/AuthNotify.java | 147 ------------------ .../github/xiaour/controller/WxCallback.java | 45 ------ SpringBootDemoV3/.gitignore | 33 ++++ SpringBootDemoV3/pom.xml | 64 ++++++++ .../boot/SpringBootDemoV3Application.java | 15 ++ .../spring/boot/controller/CatController.java | 34 ++++ .../com/xiaour/spring/boot/entity/Cat.java | 60 +++++++ .../xiaour/spring/boot/entity/PageIndex.java | 24 +++ .../xiaour/spring/boot/entity/PageInfo.java | 26 ++++ .../spring/boot/service/CatService.java | 44 ++++++ .../src/main/resources/application.properties | 15 ++ .../SpringBootDemoV3ApplicationTests.java | 13 ++ SpringBootKafkaDemo/pom.xml | 4 +- .../target/classes/application.yml | 33 ---- .../spring/boot/kafka/KafkaApplication.class | Bin 760 -> 0 bytes .../spring/boot/kafka/consumer/Consumer.class | Bin 1727 -> 0 bytes .../spring/boot/kafka/producer/Producer.class | Bin 1748 -> 0 bytes .../boot/kafka/producer/SendController.class | Bin 887 -> 0 bytes .../boot/kafka/KafkaApplicationTests.class | Bin 649 -> 0 bytes SpringBootRocketMqDemo/pom.xml | 9 +- SpringWebFluxDemo/pom.xml | 4 +- pom.xml | 27 ++++ 25 files changed, 380 insertions(+), 248 deletions(-) delete mode 100644 SpringBootDemoV2/src/main/java/com/github/xiaour/controller/AuthNotify.java delete mode 100644 SpringBootDemoV2/src/main/java/com/github/xiaour/controller/WxCallback.java create mode 100644 SpringBootDemoV3/.gitignore create mode 100644 SpringBootDemoV3/pom.xml create mode 100644 SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/SpringBootDemoV3Application.java create mode 100644 SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/controller/CatController.java create mode 100644 SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/Cat.java create mode 100644 SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageIndex.java create mode 100644 SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageInfo.java create mode 100644 SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/service/CatService.java create mode 100644 SpringBootDemoV3/src/main/resources/application.properties create mode 100644 SpringBootDemoV3/src/test/java/com/xiaour/spring/boot/SpringBootDemoV3ApplicationTests.java delete mode 100644 SpringBootKafkaDemo/target/classes/application.yml delete mode 100644 SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/KafkaApplication.class delete mode 100644 SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/consumer/Consumer.class delete mode 100644 SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/producer/Producer.class delete mode 100644 SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/producer/SendController.class delete mode 100644 SpringBootKafkaDemo/target/test-classes/com/xiaour/spring/boot/kafka/KafkaApplicationTests.class create mode 100644 pom.xml diff --git a/SpringBootDemo/pom.xml b/SpringBootDemo/pom.xml index 99875aa..3280d80 100644 --- a/SpringBootDemo/pom.xml +++ b/SpringBootDemo/pom.xml @@ -4,14 +4,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.tony - com.xiaour.spring.boot - 1.0-SNAPSHOT + com.github.xiaour + springbootv1 + 0.0.1-SNAPSHOT + SpringBootDemo + Demo project for Spring Boot + jar + + org.springframework.boot spring-boot-starter-parent 1.5.2.RELEASE + diff --git a/SpringBootDemoV2/pom.xml b/SpringBootDemoV2/pom.xml index a8d66cd..9c0856a 100644 --- a/SpringBootDemoV2/pom.xml +++ b/SpringBootDemoV2/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - SpringBootDemoV2 - SpringBootDemoV2 + com.github.xiaour + springbootv2 0.0.1-SNAPSHOT - jar - SpringBootDemoV2 Demo project for Spring Boot V2 + jar + org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.4.2 @@ -29,6 +29,7 @@ org.springframework.boot spring-boot-starter-data-redis + org.springframework.boot spring-boot-starter-web @@ -65,11 +66,6 @@ 1.10 - - dom4j - dom4j - - junit junit diff --git a/SpringBootDemoV2/src/main/java/com/github/xiaour/Application.java b/SpringBootDemoV2/src/main/java/com/github/xiaour/Application.java index c1e862e..caf30a9 100644 --- a/SpringBootDemoV2/src/main/java/com/github/xiaour/Application.java +++ b/SpringBootDemoV2/src/main/java/com/github/xiaour/Application.java @@ -10,7 +10,8 @@ public class Application { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + //SpringApplication.run(Application.class, args); + } diff --git a/SpringBootDemoV2/src/main/java/com/github/xiaour/controller/AuthNotify.java b/SpringBootDemoV2/src/main/java/com/github/xiaour/controller/AuthNotify.java deleted file mode 100644 index 11dfee9..0000000 --- a/SpringBootDemoV2/src/main/java/com/github/xiaour/controller/AuthNotify.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.github.xiaour.controller; - -import com.github.xiaour.constants.Api; -import com.github.xiaour.exception.OApiException; -import com.github.xiaour.utils.HttpHelper; -import com.github.xiaour.utils.JsonUtil; -import com.github.xiaour.utils.WXBizMsgCrypt; -import com.github.xiaour.utils.Xml2JsonUtil; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import jdk.nashorn.internal.parser.JSONParser; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.Map; - -/** - * 授权事件接收 - * @Author: Xiaour - * @Description: - * @Date: 2018/3/12 下午5:27 - */ -@RestController -public class AuthNotify { - - - /** - * 这里以后肯定要维护到配置文件或缓存的 - * @param requestBody - * @return - */ - - private static String aesKey="4a5665bf9fbe0618b7154cc9d93342b6a7b2abcf4e8"; - - private static String token="ois3rd"; - - private static String appsecret="a38dd974a9e6490dfbf5b21cd38f9996"; - - private static String component_access_token=""; - - - @RequestMapping("auth_notify") - @PostMapping(produces = "application/xml; charset=UTF-8") - public String payNotify(@RequestBody String requestBody, @RequestParam("timestamp")String timestamp, @RequestParam("nonce")String nonce, - @RequestParam("msg_signature")String msgSignature){ - String appid=null; - Map data= new HashMap<>(); - data.put("timestamp",timestamp); - data.put("nonce",nonce); - data.put("msg_signature",msgSignature); - data.put("requestBody",requestBody); - - System.out.println(data); - - try { - JsonObject jsonData= Xml2JsonUtil.xml2Json(requestBody); - - appid=jsonData.get("AppId").getAsString(); - - WXBizMsgCrypt pc = new WXBizMsgCrypt(token, aesKey,appid); - - String decode=pc.decryptMsg(msgSignature,timestamp,nonce,jsonData.get("Encrypt").getAsString()); - - System.out.println(decode); - - JsonObject decodeJson=Xml2JsonUtil.xml2Json(decode); - - getComponentTtoken(appid,appsecret,decodeJson.get("ComponentVerifyTicket").getAsString()); - - getPreAuthCode(appid); - - } catch (Exception e) { - - e.printStackTrace(); - - } - return "success"; - } - - private String getPreAuthCode(String appid) { - String preAuthCode=null; - - Map postData=new HashMap<>(); - - postData.put("component_appid",appid); - try { - - String jsonStr= HttpHelper.postByRest(Api.create_preauthcode+component_access_token,String.class,null, JsonUtil.getJsonString(postData)); - Map jsonMap= JsonUtil.json2Obj(jsonStr,Map.class); - - preAuthCode=jsonMap.get("pre_auth_code").toString(); - - String guideUrl="https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid="+appid+"&pre_auth_code="+preAuthCode+"&redirect_uri=http://sp.chifaner.com/wx/callback/auth"; - - System.out.println(guideUrl); - - return preAuthCode; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - private void getComponentTtoken(String appid, String appsecret, String componentVerifyTicket){ - - Map postData=new HashMap<>(); - - postData.put("component_appid",appid); - - postData.put("component_appsecret",appsecret); - - postData.put("component_verify_ticket",componentVerifyTicket); - - try { - - String jsonStr= HttpHelper.postByRest(Api.component_token,String.class,null, JsonUtil.getJsonString(postData)); - Map jsonMap= JsonUtil.json2Obj(jsonStr,Map.class); - component_access_token=jsonMap.get("component_access_token").toString(); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void main(String[] args) { - String xml="" + "\n" + - "\n" + ""; - try { - JsonObject jsonData= Xml2JsonUtil.xml2Json(xml); - - WXBizMsgCrypt pc = null; - - pc = new WXBizMsgCrypt(token, aesKey,"wxa797588149020de4"); - - System.out.println(jsonData.get("Encrypt").getAsString()); - - String decode=pc.decryptMsg("d5b4bcef832c27f6f2804d0055cec64864c82a54","1520922592","941622427",jsonData.get("Encrypt").getAsString()); - - JsonObject decodeJson=Xml2JsonUtil.xml2Json(decode); - - System.out.println(decodeJson.get("ComponentVerifyTicket").getAsString()); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/SpringBootDemoV2/src/main/java/com/github/xiaour/controller/WxCallback.java b/SpringBootDemoV2/src/main/java/com/github/xiaour/controller/WxCallback.java deleted file mode 100644 index 98085fa..0000000 --- a/SpringBootDemoV2/src/main/java/com/github/xiaour/controller/WxCallback.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.github.xiaour.controller; - -import com.github.xiaour.utils.Xml2JsonUtil; -import com.google.gson.JsonObject; -import org.dom4j.DocumentException; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 消息与事件接收 - * @Author: Xiaour - * @Description: - * @Date: 2018/3/12 下午5:25 - */ - -@RestController -public class WxCallback { - - @RequestMapping("callback/auth") - public String callbackAuth(String auth_code,Integer expires_in){ - System.out.println("auth_code:"+auth_code); - System.out.println("expires_in:"+expires_in); - return "success"; - } - - - @RequestMapping("callback/{appid}") - @PostMapping(produces = "application/xml; charset=UTF-8") - public String callbackMsg(@RequestBody String requestBody, @PathVariable String appid){ - System.out.println(appid); - System.out.println(requestBody); - try { - JsonObject jsonData= Xml2JsonUtil.xml2Json(requestBody); - System.out.println(jsonData); - } catch (DocumentException e) { - e.printStackTrace(); - } - return "success"; - } - - -} diff --git a/SpringBootDemoV3/.gitignore b/SpringBootDemoV3/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/SpringBootDemoV3/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/SpringBootDemoV3/pom.xml b/SpringBootDemoV3/pom.xml new file mode 100644 index 0000000..110db5f --- /dev/null +++ b/SpringBootDemoV3/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.3 + + + + com.github.xiaour + springbootv3 + 0.0.1-SNAPSHOT + SpringBootDemoV3 + Demo project for Spring Boot + jar + + + 17 + + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-web + + + + io.github.xiaour + easy-export + 1.0.1-RELEASE + + + + com.alibaba + easyexcel + 2.2.3 + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/SpringBootDemoV3Application.java b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/SpringBootDemoV3Application.java new file mode 100644 index 0000000..7b98f02 --- /dev/null +++ b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/SpringBootDemoV3Application.java @@ -0,0 +1,15 @@ +package com.xiaour.spring.boot; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBootDemoV3Application { + + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoV3Application.class, args); + //System.out.println(Math.max(10,11)); + } + + +} diff --git a/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/controller/CatController.java b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/controller/CatController.java new file mode 100644 index 0000000..d740815 --- /dev/null +++ b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/controller/CatController.java @@ -0,0 +1,34 @@ +package com.xiaour.spring.boot.controller; + +import com.xiaour.spring.boot.entity.PageIndex; +import com.xiaour.spring.boot.entity.PageInfo; +import com.xiaour.spring.boot.service.CatService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/cat") +public class CatController { + + private CatService catService; + + @Autowired + public CatController(CatService catService) { + this.catService = catService; + } + + @GetMapping("list") + public PageInfo getCatList() { + PageIndex index = new PageIndex(); + index.setPageIndex(1); + index.setPageSize(30); + return catService.getCatList(index); + } + + + + + +} diff --git a/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/Cat.java b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/Cat.java new file mode 100644 index 0000000..5aef16e --- /dev/null +++ b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/Cat.java @@ -0,0 +1,60 @@ +package com.xiaour.spring.boot.entity; + +import com.alibaba.excel.annotation.ExcelProperty; + +public class Cat { + + /** + * 宠物昵称 + */ + @ExcelProperty(value = "昵称") + private String nickName; + + /** + * 年龄 + */ + @ExcelProperty(value = "年龄") + private Integer age; + + /** + * 品种 + */ + @ExcelProperty(value = "品种") + private String category; + + public Cat() { + } + + public Cat(String nickName, Integer age, String category) { + this.nickName = nickName; + this.age = age; + this.category = category; + } + + public String getNickName() { + return nickName; + } + + public Cat setNickName(String nickName) { + this.nickName = nickName; + return this; + } + + public Integer getAge() { + return age; + } + + public Cat setAge(Integer age) { + this.age = age; + return this; + } + + public String getCategory() { + return category; + } + + public Cat setCategory(String category) { + this.category = category; + return this; + } +} diff --git a/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageIndex.java b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageIndex.java new file mode 100644 index 0000000..abaf3dc --- /dev/null +++ b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageIndex.java @@ -0,0 +1,24 @@ +package com.xiaour.spring.boot.entity; + +public class PageIndex { + + private Integer pageIndex; + + private Integer pageSize; + + public Integer getPageIndex() { + return pageIndex; + } + + public void setPageIndex(Integer pageIndex) { + this.pageIndex = pageIndex; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } +} diff --git a/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageInfo.java b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageInfo.java new file mode 100644 index 0000000..53fafdd --- /dev/null +++ b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/entity/PageInfo.java @@ -0,0 +1,26 @@ +package com.xiaour.spring.boot.entity; + +import java.util.List; + +public class PageInfo { + + private List list; + + private Integer total; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } +} diff --git a/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/service/CatService.java b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/service/CatService.java new file mode 100644 index 0000000..ba1b8c1 --- /dev/null +++ b/SpringBootDemoV3/src/main/java/com/xiaour/spring/boot/service/CatService.java @@ -0,0 +1,44 @@ +package com.xiaour.spring.boot.service; + +import com.github.xiaour.easyexport.annotation.EasyExport; +import com.github.xiaour.easyexport.annotation.EasyExportSingle; +import com.xiaour.spring.boot.entity.Cat; +import com.xiaour.spring.boot.entity.PageIndex; +import com.xiaour.spring.boot.entity.PageInfo; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@EasyExport +@Service +public class CatService { + + /** + * 这里主要是模拟数据和分页参数的一些主要逻辑 + * @param pageIndex 模拟的分页参数，这里面是伪代码，无需实现 + * @return + */ + @EasyExportSingle(value = "小猫明细",modelClass = Cat.class) + public PageInfo getCatList(PageIndex pageIndex){ + + PageInfo page = new PageInfo(); + + List list = new ArrayList<>(); + + //下面提供了两种实体赋值方式，大家可以试试那种更方便 + Cat cat1 = new Cat("咪咪",1,"波斯猫"); + + Cat cat2 = new Cat().setNickName("汤姆").setAge(6).setCategory("金渐层"); + + list.add(cat1); + + list.add(cat2); + + page.setList(list); + + page.setTotal(list.size()); + + return page; + } +} diff --git a/SpringBootDemoV3/src/main/resources/application.properties b/SpringBootDemoV3/src/main/resources/application.properties new file mode 100644 index 0000000..a39567d --- /dev/null +++ b/SpringBootDemoV3/src/main/resources/application.properties @@ -0,0 +1,15 @@ +server.servlet.context-path= /demo3 + +#??easyexport +easyexport.enabled=true +#?????? +#?????????? +easyexport.fetch.page.size=5000 +#???????????????????true??????? +easyexport.file.delete=true +#???????????????????Sheet????sheet???150000 +easyexport.file.sheet.size=15000 +#???? +easyexport.field.page.number=pageIndex +#??????? +easyexport.field.page.size=pageSize \ No newline at end of file diff --git a/SpringBootDemoV3/src/test/java/com/xiaour/spring/boot/SpringBootDemoV3ApplicationTests.java b/SpringBootDemoV3/src/test/java/com/xiaour/spring/boot/SpringBootDemoV3ApplicationTests.java new file mode 100644 index 0000000..bbe9d67 --- /dev/null +++ b/SpringBootDemoV3/src/test/java/com/xiaour/spring/boot/SpringBootDemoV3ApplicationTests.java @@ -0,0 +1,13 @@ +package com.xiaour.spring.boot; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringBootDemoV3ApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/SpringBootKafkaDemo/pom.xml b/SpringBootKafkaDemo/pom.xml index 60bf559..b0eb7a0 100644 --- a/SpringBootKafkaDemo/pom.xml +++ b/SpringBootKafkaDemo/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xiaour.spring.boot - kafka + com.github.xiaour + KafkaDemo 0.0.1-SNAPSHOT jar diff --git a/SpringBootKafkaDemo/target/classes/application.yml b/SpringBootKafkaDemo/target/classes/application.yml deleted file mode 100644 index 0b19627..0000000 --- a/SpringBootKafkaDemo/target/classes/application.yml +++ /dev/null @@ -1,33 +0,0 @@ -server: - servlet: - context-path: / - port: 8080 -spring: - kafka: - bootstrap-servers: 127.0.0.1:9092 - #生产者的配置，大部分我们可以使用默认的，这里列出几个比较重要的属性 - producer: - #每批次发送消息的数量 - batch-size: 16 - #设置大于0的值将使客户端重新发送任何数据，一旦这些数据发送失败。注意，这些重试与客户端接收到发送错误时的重试没有什么不同。允许重试将潜在的改变数据的顺序，如果这两个消息记录都是发送到同一个partition，则第一个消息失败第二个发送成功，则第二条消息会比第一条消息出现要早。 - retries: 0 - #producer可以用来缓存数据的内存大小。如果数据产生速度大于向broker发送的速度，producer会阻塞或者抛出异常，以“block.on.buffer.full”来表明。这项设置将和producer能够使用的总内存相关，但并不是一个硬性的限制，因为不是producer使用的所有内存都是用于缓存。一些额外的内存会用于压缩（如果引入压缩机制），同样还有一些用于维护请求。 - buffer-memory: 33554432 - #key序列化方式 - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - #消费者的配置 - consumer: - #Kafka中没有初始偏移或如果当前偏移在服务器上不再存在时,默认区最新 ，有三个选项 【latest, earliest, none】 - auto-offset-reset: latest - #是否开启自动提交 - enable-auto-commit: true - #自动提交的时间间隔 - auto-commit-interval: 100 - #key的解码方式 - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - #value的解码方式 - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer - #在/usr/local/etc/kafka/consumer.properties中有配置 - group-id: test-consumer-group - diff --git a/SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/KafkaApplication.class b/SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/KafkaApplication.class deleted file mode 100644 index 39bc9dcfec1ba010c8d3156bc4384d1a706ce694..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 zcmb7CO-~y!5Pc2_8@6eop+NcQfm?_~eL=mXLZXp+>GC0h!hw@_aT1eVJMwxdf2*ff zJ@g0kM^znfA|I9}1$^%@7?Kvup-YTu3xAi6+ryWf?=zM3BpA`}1!A3wU0_1m;TcaI1u` zF>lN_#w?8CHtsn1wgd-rMSN$*yT;rzre4A#zIU+X;6B6XqKu?oVi>N>Y%vs8R9i4i zG-M>!vT$1@&-r#hp2>#td9cM3X}){Tg5H%W!>xv|Lhm=pRhD>ZoXDu-Z7Zd{eZI5L zJzqs>7K+4M=}qbc8^~0Ph~ajnp^}crWA5*Yg9U*Ukxox9+!Ve_+I3T?6N)tD9b4HR zf62Xo6YBc*p76EVKe4F{^Mh~C;M&5Q2MFbcMaZ-ay!BX174d*Dru!**6(7)YXJE|5 zYITWr{O}B*MH?A!Y3}bgd2E??@POfbQ|MjQ-rxxjg%$}lVyq=Q5!YElwA>w>SX+f5 z_tIt-X&H(wnM&&R!zfakoBt+^1^aV(mv;>GuPWK^HI5%9dQVO38@9E5L4IN@mD4G`RVS4^Cew{Xq{OGa z2Yx2o5i~#cC#_dRe@Fq9QD7?HS}JdYsMJKL;GyXm? zz6E<@!xzbpTIU4HG!?V|7+_h=Yd`yHcy z!Fll(#mTWQN|f?J7j75hCjzy@fPpW-z+a{UK;T7!oFKR|E}=%=ReWkos#0DV^W?ou zB~Ssq;>_%0d_qMQaUWMGdkCLVe455Q_W5D#D*3LFw+QwxRvmnSFX?N9(FVX*^bX-V bZqRs+mQ?7S`2{RRmHantbk;@4Hdv2e5&b_yL|NiICzW`i=Yhx0N7Cx|1F!P5t z2C-PgM`pfe<6~Smt53{u!}xq^<1BEB&5vW?qVv9XFT zEv(rn8=o@PE!?rN!7y^*?jN{2B5Vh)77PnDsaia4D?e)OD>oF+q&nc46ZfPNe5=>L z%5d>P5@|madw%RU0Mh?ElBL|o920>{NYX?^_W#JnK-{P@_?;OnFdxpt=#mz}Lc!D3O zA74+?aqbw-oQS&Dcq%+iz2dgpS=r_*wUe(M$<>)xwsHbgsvfNRA!R;fIO`=!QO?`lRWN%5IZTk-af{(JE$Wm5L!04T9-&*Xs<}hs{i;D2T5e`{ak`gRC%1jFM^Uf- zpC^RjaW8IOm7bz>BlSbg6nHYqtHNtOl_@e;eJ#<65+()>jjD_PNlF@oSu6DC&fsLQF0k0moq8O z&i;W?>D+G^pG$E*#l*vt_?L(QNKBE0Op%m1l5(A7tdj`CX`&N1=R|)Jm?a;2m2kDo jZaVV;MvqXYh!;{^{2k*a2J6vSCa-zgD`26UE)Ki|Bw@+> diff --git a/SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/producer/SendController.class b/SpringBootKafkaDemo/target/classes/com/xiaour/spring/boot/kafka/producer/SendController.class deleted file mode 100644 index a532e7e3319f6aa05bb30776589b00b8f012ee0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 887 zcmb7CO>Yx15Pja}tILv>v<1pnX}GjK)IC(F0)$jm;A!@k2h$`-cxQlxYY}9eTj!lNf z(3-4FrDfQQQ#0W2l`y5{#n38!!V_a0?~7hv@bf_aYN~k5uzp->rv|dC3YFyYP;29a zQ$`mI2eGjy(>y&Z26ALYNCYI>* zp%j2+TqC6AzzQYt;sav-E!_Ev;2RcNmCwWi($O6uuto;1U&<0rvv@;I(yr3C_6Dq= Ur~o&{>YHP`E#m9MFCuRJ0m=j8R{#J2 diff --git a/SpringBootKafkaDemo/target/test-classes/com/xiaour/spring/boot/kafka/KafkaApplicationTests.class b/SpringBootKafkaDemo/target/test-classes/com/xiaour/spring/boot/kafka/KafkaApplicationTests.class deleted file mode 100644 index 3c908bf2dc5cd5d2205063b17dd03be23f834af0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmb7BO-~y!5Pc5$Xwx(S+JfN5je=B5Rn!Xz2`cr{6-W@JXJ;{qlU+OVdMSUar%D|7 z0sT>^Z=D=Ml}q<9v-9!Zn;HLketZJZ$8H-Nc;CW@7Ip-hr^cFaCa`h%aVSv#>Tb0_ zFELhMmib8gff{AZY$q;N*-&{?#mi(pOiUrrPg0l52cul+Wij{0j^)U?AZO}srsVg^ zp3mo*NmVe;4s;QU6M;_ZY|sxOaq5;Vd)K86Cf7q#7)qR5>q6{jZ8LFxET<($l@*-m z_6^li{moRW2vv(lqW>R+8aMY+4L|=T)wMIzN+vT5>t& zLcT9=;(}x#5ee1< 4.0.0 - com.xiaour.spring.boot - rocketmq + com.github.xiaour + rocketmqDemo 0.0.1-SNAPSHOT - jar - SpringBootRocketmqDemo - Demo project for Spring Boot + Demo project for RocketMQ + jar org.springframework.boot diff --git a/SpringWebFluxDemo/pom.xml b/SpringWebFluxDemo/pom.xml index a1aa877..f98a09c 100644 --- a/SpringWebFluxDemo/pom.xml +++ b/SpringWebFluxDemo/pom.xml @@ -9,10 +9,10 @@ com.github.xiaour - flux + fluxDemo 0.0.1-SNAPSHOT SpringWebFluxDemo - Demo project for Spring Boot + Demo project for Web Flux 1.8 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..028c717 --- /dev/null +++ b/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.github.xiaour + com.xiaour.spring.boot + 0.0.1-SNAPSHOT + SpringBootDemo + SpringBoot set demo + pom + + + SpringBootDemo + SpringBootDemoV2 + SpringBootDemoV3 + SpringBootKafkaDemo + SpringBootRocketMqDemo + SpringWebFluxDemo + + + + + 17 + + + From 155c426b33fc9553d5a8d50201247a1ceddc1712 Mon Sep 17 00:00:00 2001 From: zhangtao Date: Thu, 7 Mar 2024 14:13:34 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpringBootDemo/com.tony.spring.boot.iml | 122 ------------------------ 1 file changed, 122 deletions(-) delete mode 100644 SpringBootDemo/com.tony.spring.boot.iml diff --git a/SpringBootDemo/com.tony.spring.boot.iml b/SpringBootDemo/com.tony.spring.boot.iml deleted file mode 100644 index d5354ea..0000000 --- a/SpringBootDemo/com.tony.spring.boot.iml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file