Merge pull request #49 from developers-youcong/youcong-dev

Youcong dev
developers-youcong · Nov 11, 2022 · 7e78084 · 7e78084
2 parents aaf8ae8 + 1e6cbf3
commit 7e78084
Show file tree

Hide file tree

Showing 39 changed files with 493 additions and 191 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@
 - 服务注册与配置中心:Nacos、Eureka、Dubbo；
 - 支付:IJPay；
 - 微信生态支持:WxJava；
-- 多种通信支持:gRPC、HTTP等；
+- 多种通信支持:gRPC、HTTP、WebSocket等；
 - 分布式处理引擎:Apache Flink；
 - 文件存储:私有云或公有云均支持；
 - 单元测试框架:Junit；
@@ -193,23 +193,29 @@
 - 例子覆盖60%(yc-example)。
 
 
-## 本次版本V1.0.9更新
-- 1.接入空气质量数据(和风天气API)。
-- 2.新增image-combiner(Java服务端图片合成工具)。
-- 3.新增easyes(在elatic search基础上只做增强不做改变)。
-- 4.新增dynamic-tp(动态线程池监控)。
-- 5.新增Gobrs-Async(高性能异步编排)。
-- 6.新增easypdf(一个用搭积木的方式构建pdf)。
-- 7.修复若干bug。
-- 8.支持InfluxDB。
-- 9.支持Clickhouse。
-- 10.支持Ti-DB。
-- 11.支持SQL Server。
-- 12.支持postgreSQL。
-- 13.支持neo4j。
-- 14.支持couchbase。
-- 15.支持达梦数据库。
-- 16.yc-framework官方文档全部开源。
+## 本次版本V1.0.10更新
+- 1.精简与完善Example
+- 2.鉴权体系精确到接口级别
+- 3.文档全面更新
+- 4.增加JWT插件
+- 5.修复若干bug
+- 6.增加国密算法(SM2 SM3 SM4)
+- 7.升级:
+    - (1)LiteFlow升级2.9.3
+    - (2)Sa-Token升级1.32.0
+    - (3)Wx-Java升级4.4.0
+    - (4)Smart-Socket升级1.6.0
+    - (5)ShedLock升级4.42.0
+    - (6)T-Log升级1.5.0
+    - (7)IJPay升级2.9.4
+    - (8)Image Combiner升级2.3.7
+    - (9)Gobrs Async升级1.2.3-RELEASE
+    - (10)ElasticJob升级3.0.2
+    - (11)Easy-Poi升级4.4.0
+    - (12)Dynamic-Tp升级1.0.9
+    - (13)Easy-ES升级1.0.3
+    - (14)Dubbo升级3.1.2
+    - (15)WebMagic升级0.7.6
 
 ## 八、环境
 

diff --git a/pom.xml b/pom.xml
@@ -44,12 +44,12 @@
         <spring-webmvc.version>5.2.2.RELEASE</spring-webmvc.version>
         <jsoup.version>1.11.3</jsoup.version>
         <webmagic.version>0.7.4</webmagic.version>
-        <sa-token.version>1.31.0</sa-token.version>
+        <sa-token.version>1.32.0</sa-token.version>
         <jackson-annotations.version>2.11.3</jackson-annotations.version>
         <jbcrypt.version>0.4</jbcrypt.version>
         <guava.version>21.0</guava.version>
         <commons-net.version>3.6</commons-net.version>
-        <t-log.version>1.4.1</t-log.version>
+        <t-log.version>1.5.0</t-log.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -499,6 +499,24 @@
                 <version>${version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.yc.framework</groupId>
+                <artifactId>yc-common-sqlserver</artifactId>
+                <version>${version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yc.framework</groupId>
+                <artifactId>yc-common-clickhouse</artifactId>
+                <version>${version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yc.framework</groupId>
+                <artifactId>yc-common-websocket</artifactId>
+                <version>${version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -577,20 +595,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <repository>
-        <id>central</id>
-        <name>aliyun maven</name>
-        <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-        <layout>default</layout>
-        <!-- 是否开启发布版构件下载 -->
-        <releases>
-            <enabled>true</enabled>
-        </releases>
-        <!-- 是否开启快照版构件下载 -->
-        <snapshots>
-            <enabled>false</enabled>
-        </snapshots>
-    </repository>
 
     <build>
         <plugins>

diff --git a/yc-common/pom.xml b/yc-common/pom.xml
@@ -63,6 +63,7 @@
         <module>yc-common-postgresql</module>
         <module>yc-common-neo4j</module>
         <module>yc-common-dmjdbc</module>
+        <module>yc-common-websocket</module>
     </modules>
 
 

diff --git a/yc-common/yc-common-core/src/main/java/com/yc/common/core/base/utils/JudgeSysUtil.java b/yc-common/yc-common-core/src/main/java/com/yc/common/core/base/utils/JudgeSysUtil.java
@@ -0,0 +1,53 @@
+package com.yc.common.core.base.utils;
+
+/**
+ * @description:
+ * @author: youcong
+ */
+public class JudgeSysUtil {
+
+    private static final String OS_NAME = "os.name";
+
+    private static final String LINUX_SYS = "linux";
+
+    private static final String WINDOWS_SYS = "windows";
+
+    private static final String OTHER_SYS = "other system";
+
+    /**
+     * Linux
+     *
+     * @return
+     */
+    public static boolean isLinux() {
+        return System.getProperty(OS_NAME).toLowerCase().contains("linux");
+    }
+
+    /**
+     * Windows
+     *
+     * @return
+     */
+    public static boolean isWindows() {
+        return System.getProperty(OS_NAME).toLowerCase().contains("windows");
+    }
+
+    /**
+     * 判断当前操作系统
+     *
+     * @return
+     */
+    public static String JudgeSystem() {
+        if (isLinux()) {
+            return LINUX_SYS;
+        } else if (isWindows()) {
+            return WINDOWS_SYS;
+        } else {
+            return OTHER_SYS;
+        }
+    }
+
+    public static void main(String[] args) {
+        System.out.println("current system is:" + JudgeSysUtil.JudgeSystem());
+    }
+}
diff --git a/yc-common/yc-common-crawler/pom.xml b/yc-common/yc-common-crawler/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-crawler</artifactId>
     <properties>
-        <webmagic.version>0.7.4</webmagic.version>
+        <webmagic.version>0.7.6</webmagic.version>
     </properties>
     <dependencies>
         <!-- webmagic-->

diff --git a/yc-common/yc-common-dubbo/pom.xml b/yc-common/yc-common-dubbo/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-dubbo</artifactId>
     <properties>
-        <dubbo.version>2.7.6</dubbo.version>
+        <dubbo.version>3.1.2</dubbo.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-dynamic-tp/pom.xml b/yc-common/yc-common-dynamic-tp/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-dynamic-tp</artifactId>
     <properties>
-        <dynamic-tp.version>1.0.8</dynamic-tp.version>
+        <dynamic-tp.version>1.0.9</dynamic-tp.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-easyes/pom.xml b/yc-common/yc-common-easyes/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-easyes</artifactId>
     <properties>
-        <easy-es.version>1.0.1</easy-es.version>
+        <easy-es.version>1.0.3</easy-es.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-easypoi/pom.xml b/yc-common/yc-common-easypoi/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>yc-common-easypoi</artifactId>
 
     <properties>
-        <easypoi.version>4.1.0</easypoi.version>
+        <easypoi.version>4.4.0</easypoi.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-elasticjob/pom.xml b/yc-common/yc-common-elasticjob/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>yc-common-elasticjob</artifactId>
 
     <properties>
-        <elasticjob.version>3.0.1</elasticjob.version>
+        <elasticjob.version>3.0.2</elasticjob.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-gobrs-async/pom.xml b/yc-common/yc-common-gobrs-async/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>yc-common-gobrs-async</artifactId>
 
     <properties>
-        <gobrs-async.version>1.2.1-RELEASE</gobrs-async.version>
+        <gobrs-async.version>1.2.3-RELEASE</gobrs-async.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-image-combiner/pom.xml b/yc-common/yc-common-image-combiner/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-image-combiner</artifactId>
     <properties>
-        <image-combiner.version>2.3.5</image-combiner.version>
+        <image-combiner.version>2.3.7</image-combiner.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-liteflow/pom.xml b/yc-common/yc-common-liteflow/pom.xml
@@ -14,7 +14,7 @@
 
 
     <properties>
-        <liteflow.version>2.9.0</liteflow.version>
+        <liteflow.version>2.9.3</liteflow.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-pay/pom.xml b/yc-common/yc-common-pay/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>yc-common-pay</artifactId>
 
     <properties>
-        <ijapy.version>2.7.9</ijapy.version>
+        <ijapy.version>2.9.4</ijapy.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-seata/pom.xml b/yc-common/yc-common-seata/pom.xml
@@ -11,16 +11,11 @@
 
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-seata</artifactId>
-
-
     <dependencies>
-
-        <!-- seata-spring-boot-starter -->
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-spring-boot-starter</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
diff --git a/yc-common/yc-common-shedlock/pom.xml b/yc-common/yc-common-shedlock/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.yc.framework</groupId>
     <artifactId>yc-common-shedlock</artifactId>
     <properties>
-        <shedlock.version>4.28.0</shedlock.version>
+        <shedlock.version>4.42.0</shedlock.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-common/yc-common-smart-socket/pom.xml b/yc-common/yc-common-smart-socket/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>yc-common-smart-socket</artifactId>
 
     <properties>
-        <smart.version>1.5.15</smart.version>
+        <smart.version>1.6.0</smart.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/yc-example/yc-example-smart-socket/pom.xml → yc-common/yc-common-websocket/pom.xml b/yc-example/yc-example-smart-socket/pom.xml → yc-common/yc-common-websocket/pom.xml
@@ -3,19 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yc-example</artifactId>
+        <artifactId>yc-common</artifactId>
         <groupId>com.yc.framework</groupId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.yc.framework</groupId>
-    <artifactId>yc-example-smart-socket</artifactId>
-
+    <artifactId>yc-common-websocket</artifactId>
     <dependencies>
         <dependency>
-            <groupId>com.yc.framework</groupId>
-            <artifactId>yc-common-smart-socket</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/yc-common/yc-common-wx/pom.xml b/yc-common/yc-common-wx/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>yc-common-wx</artifactId>
 
     <properties>
-        <wx.version>4.1.0</wx.version>
+        <wx.version>4.4.0</wx.version>
     </properties>
     <dependencies>
         <!-- 微信支付 -->

diff --git a/yc-example/pom.xml b/yc-example/pom.xml
@@ -41,7 +41,6 @@
         <module>yc-example-test</module>
         <module>yc-example-netty</module>
         <module>yc-example-liteflow</module>
-        <module>yc-example-smart-socket</module>
         <module>yc-example-dynamic-tp</module>
         <module>yc-example-gobrs-async</module>
         <module>yc-example-image-combiner</module>
@@ -57,6 +56,7 @@
         <module>yc-example-quartz</module>
         <module>yc-example-postgresql</module>
         <module>yc-example-neo4j</module>
+        <module>yc-example-websocket</module>
     </modules>
 
 

diff --git a/yc-example/yc-example-liteflow/src/main/java/com/yc/example/liteflow/component/AProcess.java b/yc-example/yc-example-liteflow/src/main/java/com/yc/example/liteflow/component/AProcess.java
@@ -16,9 +16,5 @@ public class AProcess extends NodeComponent {
     public void process() {
         System.out.println("第一道流程");
         ProcessReqDTO req = this.getSlot().getRequestData();
-        ProcessSlot processSlot = this.getSlot();
-        processSlot.setProcessId(req.getProcessId());
-        processSlot.setProcessName(req.getProcessName());
-        processSlot.setProcessStatus(req.getProcessStatus());
     }
 }
diff --git a/yc-example/yc-example-liteflow/src/main/java/com/yc/example/liteflow/component/BProcess.java b/yc-example/yc-example-liteflow/src/main/java/com/yc/example/liteflow/component/BProcess.java
@@ -1,6 +1,5 @@
 package com.yc.example.liteflow.component;
 
-import com.yc.example.liteflow.slot.ProcessSlot;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
@@ -13,9 +12,5 @@ public class BProcess extends NodeComponent {
     @Override
     public void process() throws Exception {
         System.out.println("第二道流程");
-        ProcessSlot processSlot = this.getSlot();
-        if (processSlot.getProcessId() == null) {
-            throw new RuntimeException("流程ID为空");
-        }
     }
 }
diff --git a/yc-example/yc-example-liteflow/src/main/java/com/yc/example/liteflow/component/CProcess.java b/yc-example/yc-example-liteflow/src/main/java/com/yc/example/liteflow/component/CProcess.java
@@ -1,6 +1,5 @@
 package com.yc.example.liteflow.component;
 
-import com.yc.example.liteflow.slot.ProcessSlot;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +12,5 @@ public class CProcess extends NodeComponent {
     @Override
     public void process() throws Exception {
         System.out.println("第三道流程");
-        ProcessSlot processSlot = this.getSlot();
-        System.out.println("result:" + processSlot);
     }
 }