Merge branch 'dev'

pig-mesh · Jun 17, 2023 · 94b5108 · 94b5108
2 parents 3ca9d94 + 46b0e0a
commit 94b5108
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 33 deletions.
diff --git a/.gitee/ISSUE_TEMPLATE/config.yml b/.gitee/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false # 不允许用户创建空白 Issue
+contact_links:
+  - name: 遇到问题先去看文档！谢谢！ # 外部网站名称
+    url: https://wiki.pig4cloud.com/ # 跳转的外部网站目标地址
+    about: 文档可以解决你80%的疑惑 # 跳转外部网站的描述说明
diff --git a/.gitee/ISSUE_TEMPLATE/issue.yml b/.gitee/ISSUE_TEMPLATE/issue.yml
@@ -0,0 +1,30 @@
+name: 问题咨询
+description: "![扫码加入微信群](https://minio.pigx.top/oss/1648184189.png)"
+body:
+  - type: dropdown
+    id: version
+    attributes:
+      label: PIG版本
+      options:
+        - "3.6"
+        - "3.5"
+        - "3.4"
+        - "3.3"
+        - "3.2"
+        - "3.1"
+        - "3.0"
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: 是否修改了包名
+      options:
+        - label: 是
+          required: false
+  - type: textarea
+    id: desired-solution
+    attributes:
+      label: 问题描述
+      description: 详细问题，提供相应截图和日志
+    validations:
+      required: true
diff --git a/README.md b/README.md
@@ -15,19 +15,19 @@
 
 ## 文档视频
 
-[ 🚀🚀🚀 低代码数据可视化](http://datav.avuejs.com)
+[ 🚀🚀🚀 低代码数据可视化](http://datav.pig4cloud.com)
 
-[ 配套文档 wiki.pigx.vip](https://wiki.pigx.vip)
+[ 配套文档 wiki.pig4cloud.com](https://wiki.pig4cloud.com)
 
-[ 配套视频 tv.pigx.vip](https://www.bilibili.com/video/BV12t411B7e9)
+[ 配套视频 tv.pig4cloud.com](https://www.bilibili.com/video/BV12t411B7e9)
 
-[PIGX 在线体验 pigx.pigx.vip](http://pigx.pigx.vip)
+[PIGX 在线体验 pigx.pig4cloud.com](http://pigx.pig4cloud.com)
 
-[产品白皮书 paper.pigx.vip](https://paper.pigx.vip)
+[产品白皮书 paper.pig4cloud.com](https://paper.pig4cloud.com)
 
 ## 微信群 [禁广告]
 
-![](https://minio.pigx.vip/oss/1648184189.png)
+![](https://minio.pigx.top/oss/1648184189.png)
 
 ## 快速开始
 
@@ -41,11 +41,11 @@
 | 依赖                          | 版本         |
 |-----------------------------|------------|
 | Spring Boot                 | 2.7.12     |
-| Spring Cloud                | 2021.0.6   |
+| Spring Cloud                | 2021.0.7   |
 | Spring Cloud Alibaba        | 2021.0.5.0 |
 | Spring Authorization Server | 0.4.2      |
 | Mybatis Plus                | 3.5.3.1    |
-| hutool                      | 5.8.17     |
+| hutool                      | 5.8.19     |
 
 ### 模块说明
 
@@ -80,15 +80,10 @@ pig
 
 ### 本地开发 运行
 
-pig 提供了详细的[部署文档 wiki.pigx.vip](https://www.yuque.com/pig4cloud/pig/vsdox9)，包括开发环境安装、服务端代码运行、前端代码运行等。
+pig 提供了详细的[部署文档 wiki.pig4cloud.com](https://www.yuque.com/pig4cloud/pig/vsdox9)，包括开发环境安装、服务端代码运行、前端代码运行等。
 
 请务必**完全按照**文档部署运行章节 进行操作，减少踩坑弯路！！
 
-### 定制自己微服务
-
-[PIG DIY](https://pig4cloud.com/#/common/diy)
-
-[PIG ARCHETYPE](https://pig4cloud.com/#/common/archetype)
 
 ### Docker 运行
 
@@ -111,12 +106,12 @@ cnpm install && cnpm run build:docker && cd docker && docker-compose up -d
 
 <table>
   <tr>
-    <td><a href="https://www.bilibili.com/video/av45084065" target="_blank"><img src="https://minio.pigx.vip/oss/1655474345.jpg"></a></td>
-    <td><a href="https://www.bilibili.com/video/av77344954" target="_blank"><img src="https://minio.pigx.vip/oss/1656837143.jpg"></a></td>
+    <td><a href="https://www.bilibili.com/video/av45084065" target="_blank"><img src="https://minio.pigx.top/oss/1655474345.jpg"></a></td>
+    <td><a href="https://www.bilibili.com/video/av77344954" target="_blank"><img src="https://minio.pigx.top/oss/1656837143.jpg"></a></td>
   </tr>
     <tr>
-    <td><a href="https://www.bilibili.com/video/BV1J5411476V" target="_blank"><img src="https://minio.pigx.vip/oss/1655474369.jpg"></a></td>
-    <td><a href="https://www.bilibili.com/video/BV14p4y197K5" target="_blank"><img src="https://minio.pigx.vip/oss/1655474381.jpg"></a></td>
+    <td><a href="https://www.bilibili.com/video/BV1J5411476V" target="_blank"><img src="https://minio.pigx.top/oss/1655474369.jpg"></a></td>
+    <td><a href="https://www.bilibili.com/video/BV14p4y197K5" target="_blank"><img src="https://minio.pigx.top/oss/1655474381.jpg"></a></td>
   </tr>
 </table>
 
@@ -127,7 +122,7 @@ cnpm install && cnpm run build:docker && cd docker && docker-compose up -d
 pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICENSE-2.0.html)。
 允许商业使用，但务必保留类作者、Copyright 信息。
 
-![](https://minio.pigx.vip/oss/1655474288.jpg)
+![](https://minio.pigx.top/oss/1655474288.jpg)
 
 ### 其他说明
 

diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java
@@ -51,7 +51,7 @@
 /**
  * @author lengleng
  * @date 2022/5/27
- *
+ * <p>
  * 认证服务器配置
  */
 @Configuration
@@ -115,20 +115,17 @@ public OAuth2TokenGenerator oAuth2TokenGenerator() {
 	 * @return DelegatingAuthenticationConverter
 	 */
 	private AuthenticationConverter accessTokenRequestConverter() {
-		return new DelegatingAuthenticationConverter(Arrays.asList(
-				new OAuth2ResourceOwnerPasswordAuthenticationConverter(),
-				new OAuth2ResourceOwnerSmsAuthenticationConverter(), new OAuth2RefreshTokenAuthenticationConverter(),
-				new OAuth2ClientCredentialsAuthenticationConverter(),
-				new OAuth2AuthorizationCodeAuthenticationConverter(),
-				new OAuth2AuthorizationCodeRequestAuthenticationConverter()));
+		return new DelegatingAuthenticationConverter(
+				Arrays.asList(new OAuth2ResourceOwnerPasswordAuthenticationConverter(),
+						new OAuth2ResourceOwnerSmsAuthenticationConverter(),
+						new OAuth2AuthorizationCodeRequestAuthenticationConverter()));
 	}
 
 	/**
 	 * 注入授权模式实现提供方
-	 *
+	 * <p>
 	 * 1. 密码模式 </br>
 	 * 2. 短信登录 </br>
-	 *
 	 */
 	@SuppressWarnings("unchecked")
 	private void addCustomOAuth2GrantAuthenticationProvider(HttpSecurity http) {

diff --git a/pig-auth/src/main/resources/templates/ftl/login.ftl b/pig-auth/src/main/resources/templates/ftl/login.ftl
@@ -28,9 +28,5 @@
         </#if>
 	</form>
 </div>
-<footer>
-	<p>support by: pig4cloud</p>
-	<p>email: <a href="mailto:[email protected]">[email protected]</a>.</p>
-</footer>
 </body>
 </html>
diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
@@ -33,7 +33,7 @@
         <oss.version>1.0.5</oss.version>
         <sms.version>2.0.2</sms.version>
         <jaxb.version>2.3.5</jaxb.version>
-        <hutool.version>5.8.18</hutool.version>
+        <hutool.version>5.8.19</hutool.version>
         <mica.version>2.7.4</mica.version>
         <sentinel.version>1.8.4</sentinel.version>
     </properties>