upms ok

wishing-platform/platform-core/platform-core-base/src/main/java/cn/qinys/platform/base/response/ResultCodeEnum.java

@@ -18,7 +18,7 @@ public enum ResultCodeEnum {
     UNAUTHORIZED(401, "未认证（签名错误）"),
     MISSING_REQUEST_PARAMETER(402, "缺少请求参数"),
 
-    INTERNAL_SERVER_ERROR(500, "当前定位失效，请稍后重试~"),
+    INTERNAL_SERVER_ERROR(500, "服务器内部错误，请稍后重试~"),
     DATABASE_ERROR(501, "数据库操作错误"),
     CONNECTION_ERROR(502, "网络连接失败"),
 

wishing-platform/platform-core/platform-core-base/src/main/java/cn/qinys/platform/base/security/utils/CurrentUtils.java

@@ -7,10 +7,10 @@ import cn.qinys.platform.base.security.constants.Constants;
 import cn.qinys.platform.base.utils.RedisUtils;
 import cn.qinys.platform.base.utils.SpringUtil;
 import cn.qinys.platform.base.vo.LoginUserInfo;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -114,7 +114,7 @@ public class CurrentUtils {
 
     public static String getToken() {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request = (HttpServletRequest) attributes.getRequest();
+        HttpServletRequest request = attributes.getRequest();
         String token = request.getHeader(Constants.JwtEnum.AUTHORIZATION.getCode());
         return token == null ? null : token.replaceFirst(Constants.JwtEnum.BEARER.getCode(), "").trim();
     }

wishing-platform/platform-gateway/src/main/resources/application-local.yml

@@ -6,7 +6,7 @@ spring:
         namespace: a62810f4-be60-4973-8bd0-8199d19526ef
         username: nacos
         password: h8zG&mehJ#.s7V
-        group: wishing-local
+        group: wishing
 
   datasource:
     username: root

wishing-platform/platform-gateway/src/main/resources/application-router.yml

@@ -4,6 +4,12 @@ spring:
       server:
         webflux:
           routes:
+            - id: wishing-upms
+              uri: lb://wishing-upms
+              predicates:
+                - Path=/dgapi/upms/**
+              filters:
+                - StripPrefix=1
             # 移动端管理
             - id: wishing-mobile
               uri: lb://wishing-mobile

wishing-platform/platform-gateway/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8999
+  port: 9999
 spring:
   application:
     name: wishing-gateway

wishing-platform/platform-service/platform-service-upms/pom.xml

@@ -56,4 +56,47 @@
             <artifactId>hibernate-validator</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <finalName>wishing-upms</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.yml</include>
+                    <include>**/*.yaml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.5.14</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.12.0</version>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

wishing-platform/platform-service/platform-service-upms/src/main/resources/application-dev.yml → wishing-platform/platform-service/platform-service-upms/src/main/resources/application-local.yml

@@ -6,7 +6,7 @@ spring:
     nacos:
       discovery:
         server-addr: 192.168.1.7:8848
-        namespace: 1c7a4965-25aa-42f1-8667-4c6b6366a022
+        namespace: a62810f4-be60-4973-8bd0-8199d19526ef
         username: nacos
         password: h8zG&mehJ#.s7V
         group: wishing

wishing-platform/platform-service/platform-service-upms/src/main/resources/application.yml

@@ -6,9 +6,9 @@ spring:
   jackson:
     time-zone: GMT+8
   application:
-    name: platform-upms
+    name: wishing-upms
   profiles:
-    active: dev
+    active: local
   servlet:
     multipart:
       max-file-size: 20MB
@@ -17,7 +17,6 @@ jwt:
   ignore-urls:
     - /upms/login/**
     - /upms/ext/**
-    - /**/upms/login/**
 
 
 tenant: