ibizdev提交

app_web/src/components/app-form-druipart/app-form-druipart.vue

@@ -47,6 +47,14 @@ export default class AppFormDRUIPart extends Vue {
      */
     @Prop({ default: '' }) public refreshitems!: string;
 
+    /**
+     * 禁止加载
+     *
+     * @type {string}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop({ default: false }) public isForbidLoad!: boolean;
+
     /**
      * 关系视图类型
      *
@@ -254,7 +262,9 @@ export default class AppFormDRUIPart extends Vue {
                 this.blockUIStop();
             }
         }
-        this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+        if(!this.isForbidLoad){
+            this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+        }
     }
 
     /**

app_web/src/environments/environment.ts

@@ -22,7 +22,7 @@ export const Environment = {
     // 是否为开发模式
     devMode: true,
     // 项目模板地址
-    ProjectUrl: "http://demo.ibizlab.cn/groups/ibizr7pfstdtempl",
+    ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
     // 配置平台地址
     StudioUrl: "http://172.16.170.145/slnstudio/",
     // 中心标识

app_web/src/utils/studio-action/StudioActionUtil.ts

@@ -92,7 +92,7 @@ export class StudioActionUtil {
         const config: any = await this.getConfig(viewName);
         if (config) {
             const context: string = `视图模块：${config.viewmodule}\n视图标识：${config.viewname}\n视图类型：${config.viewtype}\n`;
-            window.open(`${Environment.ProjectUrl}/issues/`, '_blank');
+            window.open(`${Environment.ProjectUrl}/issues/new?issue[title]=${encodeURIComponent('问题')}&issue[description]=${encodeURIComponent(context)}`, '_blank');
         }
     }
 

app_web/src/widgets/sys-role/main-form/main-form-base.vue

@@ -46,6 +46,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='sys_role' 
     :parentdata='{"srfparentdefname":"SYS_ROLEID","srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID","SRFDER1NID":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID"}'
     :parameters="[
@@ -81,6 +82,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='sys_role' 
     :parentdata='{"srfparentdefname":"SYS_ROLEID","srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_USER_ROLE_SYS_ROLE_SYS_ROLEID","SRFDER1NID":"DER1N_SYS_USER_ROLE_SYS_ROLE_SYS_ROLEID"}'
     :parameters="[

app_web/src/widgets/sys-user/main-form/main-form-base.vue

@@ -25,6 +25,7 @@
     <app-form-druipart
     
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='sys_user' 
     :parentdata='{"srfparentdefname":"SYS_USERID","srfparentdename":"SYS_USER","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_USER_ROLE_SYS_USER_SYS_USERID","SRFDER1NID":"DER1N_SYS_USER_ROLE_SYS_USER_SYS_USERID"}'
     :parameters="[

config.xml

@@ -37,11 +37,6 @@
 	  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-app/ibzuaa-app-web/src/main/java/cn/ibizlab/web/config/webSecurityConfig.java

@@ -42,6 +42,9 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.auth.logoutpath:v7/logout}")
+    private String logoutPath;
+
     @Value("${ibiz.file.uploadpath:ibizutil/upload}")
     private String uploadpath;
 
@@ -107,6 +110,8 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                //放行注销请求
+                .antMatchers( HttpMethod.GET,"/"+logoutPath).permitAll()
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()

ibzuaa-boot/src/main/resources/application-dev.yml

 server:
-  port: 40002
+  port: 8080
 
 
 

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 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

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

@@ -3,11 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40002
+  port: 8081
\ No newline at end of file

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40002
+  port: 8081

ibzuaa-util/src/main/java/cn/ibizlab/util/rest/AppController.java

@@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import cn.ibizlab.util.security.AuthenticationUser;
+import cn.ibizlab.util.service.AuthenticationUserService;
 
 @RestController
 @RequestMapping(value = "")
@@ -18,6 +20,9 @@ public class AppController {
 	@Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
+	@Autowired
+	private AuthenticationUserService userDetailsService;
+
 	@RequestMapping(method = RequestMethod.GET, value = "/appdata")
 	public ResponseEntity<JSONObject> getAppData() {
 
@@ -36,4 +41,11 @@ public class AppController {
 		appData.put("enablepermissionvalid",enablePermissionValid);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}
+
+    @RequestMapping(method = RequestMethod.GET, value = "${ibiz.auth.logoutpath:v7/logout}")
+    public void logout() {
+		if(AuthenticationUser.getAuthenticationUser()!=null){
+			userDetailsService.resetByUsername(AuthenticationUser.getAuthenticationUser().getUsername());
+    	}
+    }
 }