Merge remote-tracking branch 'origin/master'

app_web/CHANGELOG.md

+## v7.0.0-alpha.7 [2020-5-28]
+
+### Bug修复
+
+修复门户部件flex布局
+
+修复表格选择框列样式出现省略号
+
+修复批删除传递参数调整
+
+修复表单上界面行为参数传递bug
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复导航类视图宽度格式
+
+修复图表排序
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+### 功能新增及优化
+
+#### 模板
+
+列表，数据视图默认排序
+
+面板项支持偏移
+
+应用支持自定义默认端口
+
+门户部件图标和容器样式
+
+表格列头图片和头部样式
+
+表格操作列图标
+
+表格编辑项值规则
+
+增加树选择双击事件
+
+增加图表分组属性计数统计（srfcount）
+
+增加雷达图支持
+
+#### 基础文件
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
 ## v7.0.0-alpha.6 [2020-5-23]
 
 ### Bug修复

app_web/src/styles/default.less

@@ -207,7 +207,7 @@
     }
 }
 
-.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview{
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9{
   >.view-card.view-no-caption{
     >.ivu-card-body{
       height: 100%;

app_web/src/utils/interceptor/interceptor.ts

@@ -125,6 +125,13 @@ export class Interceptors {
      * @memberof Interceptors
      */
     private doNoLogin(data: any = {}): void {
+        // 清除user和token
+        if(localStorage.getItem('user')){
+            localStorage.removeItem('user');
+        }
+        if(localStorage.getItem('token')){
+            localStorage.removeItem('token');
+        }
         if (data.loginurl && !Object.is(data.loginurl, '') && data.originurl && !Object.is(data.originurl, '')) {
             let _url = encodeURIComponent(encodeURIComponent(window.location.href));
             let loginurl: string = data.loginurl;

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

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_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,21 @@ 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
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1