Преглед изворни кода

Merge branch 'sit' into uat-20260202

# Conflicts:
#	docs/jenkins/Jenkinsfile-uat-build-deploy.groovy
dujian пре 5 дана
родитељ
комит
8c002630d5

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/PerformanceListServiceImpl.java

@@ -595,7 +595,7 @@ public class PerformanceListServiceImpl implements PerformanceListService {
         }
 
         try {
-            String startStr = TODAY_DATE_FORMAT.format(startTime) + "/ " + TIME_FORMAT.format(startTime);
+            String startStr = TODAY_DATE_FORMAT.format(startTime) + "/" + TIME_FORMAT.format(startTime);
             String endStr = TODAY_DATE_FORMAT.format(endTime) + "/" + TIME_FORMAT.format(endTime);
             return startStr + " – " + endStr;
         } catch (Exception e) {

+ 1 - 1
alien-store/src/main/java/shop/alien/store/util/ai/AiAuthTokenUtil.java

@@ -26,7 +26,7 @@ public class AiAuthTokenUtil {
     @Value("${third-party-login.base-url}")
     private String loginUrl;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")