Merge remote-tracking branch 'origin/master'

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
+      mvn clean package -Papi
+      cd ibzuaa-provider/ibzuaa-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,9 +3,22 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40002
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/UAACoreResource.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpRequest;
@@ -89,18 +90,24 @@ public class UAACoreResource {
     @Autowired
     private SysAppService sysAppService;
 
+    @Value("${ibiz.admin.userid:0100}")
+    private String adminuserid;
+
     @GetMapping(value = "uaa/access-center/app-switcher/{id}")
-    public ResponseEntity<JSONObject> appswitcher(@PathVariable("id") String id, HttpServletRequest request)
+    public ResponseEntity<JSONObject> appswitcher(@PathVariable("id") String id)
     {
-        String proto=request.getHeader("x-forwarded-proto");
-        String hosts=request.getHeader("x-forwarded-for");
-        String domains="";
-        if(StringUtils.isEmpty(proto))
-            proto="http";
-        if(!StringUtils.isEmpty(hosts))
-            domains=proto+"://"+hosts;
-
-        return ResponseEntity.ok(sysAppService.getAppSwitcher(id, AuthenticationUser.getAuthenticationUser().getUserid()));
+//        String proto=request.getHeader("x-forwarded-proto");
+//        String hosts=request.getHeader("x-forwarded-for");
+//        String domains="";
+//        if(StringUtils.isEmpty(proto))
+//            proto="http";
+//        if(!StringUtils.isEmpty(hosts))
+//            domains=proto+"://"+hosts;
+        String userId = AuthenticationUser.getAuthenticationUser().getUserid();
+        if(StringUtils.isEmpty(userId))
+            userId = adminuserid;
+
+        return ResponseEntity.ok(sysAppService.getAppSwitcher(id,userId));
     }
 
     @PutMapping(value = "uaa/access-center/app-switcher/{id}")