ibiz4j 发布系统代码

app_web/package.json

@@ -27,7 +27,7 @@
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "ibiz-gantt-elastic": "^1.0.15",
-    "ibiz-vue-lib": "^0.1.9",
+    "ibiz-vue-lib": "^0.1.10",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_web/src/components/ibiz-group-picker/ibiz-group-picker.vue

@@ -4,7 +4,7 @@
             <div v-if="showTree" class="ibiz-group-tree">
                 <ibiz-select-tree :NodesData="treeItems" v-model="treeSelectVal" :treeOnly="true" :defaultChecked="true" @select="treeSelect"></ibiz-select-tree>
             </div>
-            <div class="ibiz-group-content">
+            <div class="ibiz-group-content" :style="{width:showTree?'calc(100% - 400px)':'100%'}">
                 <ibiz-group-card :data="cardItems" text="label" value="id" groupName="group" :multiple="multiple" :defaultSelect="cardSelctVal" @select="groupSelect"></ibiz-group-card>
             </div>
         </div>
@@ -275,26 +275,29 @@ export default class IBizGroupPicker extends Vue {
 </script>
 
 <style lang="less">
-.ibiz-group-container {
-    display: flex;
-    height: calc(100% - 65px);
-    .ibiz-group-tree {
-        width: 400px;
-        border-right: 1px solid #ddd;
-        padding: 0 10px;
-        overflow: auto;
-        height: 100%;
+.ibiz-group-picker{
+    height:100%;
+    .ibiz-group-container {
+        display: flex;
+        height: calc(100% - 65px);
+        .ibiz-group-tree {
+            width: 400px;
+            border-right: 1px solid #ddd;
+            padding: 0 10px;
+            overflow: auto;
+            height: 100%;
+        }
+        .ibiz-group-content {
+            flex-grow: 1;
+            padding: 0 10px;
+            overflow: auto;
+            height: 100%;
+        }
     }
-    .ibiz-group-content {
-        flex-grow: 1;
-        padding: 0 10px;
-        overflow: auto;
-        height: 100%;
+    .ibiz-group-footer {
+        padding: 16px;
+        text-align: right;
+        border-top: 1px solid #ddd;
     }
 }
-.ibiz-group-footer {
-    padding: 16px;
-    text-align: right;
-    border-top: 1px solid #ddd;
-}
 </style>
\ No newline at end of file

ibzwf-boot/src/main/java/cn/ibizlab/DevBootApplication.java

+package cn.ibizlab;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.context.annotation.ComponentScan;
+import java.util.List;
+
+@Slf4j
+@EnableDiscoveryClient
+@Configuration
+@EnableTransactionManagement
+@EnableFeignClients(basePackages = {"cn.ibizlab" })
+@SpringBootApplication(exclude = {
+            org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
+})
+@ComponentScan(basePackages = {"cn.ibizlab"}
+//        ,excludeFilters={
+//                @ComponentScan.Filter(type= org.springframework.context.annotation.FilterType.REGEX,pattern="cn.ibizlab.xxx.rest.xxx"),
+//        }
+)
+@Import({
+        org.springframework.cloud.openfeign.FeignClientsConfiguration.class
+})
+public class DevBootApplication extends WebMvcConfigurerAdapter{
+
+    public static void main(String[] args) {
+        SpringApplication.run(DevBootApplication.class,args);
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        super.addArgumentResolvers(argumentResolvers);
+        argumentResolvers.add(new cn.ibizlab.util.web.SearchContextHandlerMethodArgumentResolver());
+    }
+}

ibzwf-dependencies/pom.xml

@@ -317,12 +317,6 @@
             <artifactId>h2</artifactId>
         </dependency>
 
-        <!--xxl-job定时服务 -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-        </dependency>
-
         <!--  Error -->
 
         <!--  Security  -->

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/ibzwfapiApplication.java

+package cn.ibizlab.api;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import java.util.List;
+
+@Slf4j
+@EnableDiscoveryClient
+@Configuration
+@EnableTransactionManagement
+@ComponentScan(basePackages = {"cn.ibizlab"}
+//        ,excludeFilters={
+//                @ComponentScan.Filter(type= org.springframework.context.annotation.FilterType.REGEX,pattern="cn.ibizlab.api.rest.xxx"),
+//        }
+)
+@EnableMongoRepositories(basePackages = {"cn.ibizlab"})
+@MapperScan("cn.ibizlab.*.mapper")
+@SpringBootApplication(exclude = {
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+            org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
+})
+@Import({
+        org.springframework.cloud.openfeign.FeignClientsConfiguration.class
+})
+@EnableFeignClients(basePackages = {"cn.ibizlab" })
+public class ibzwfapiApplication extends WebMvcConfigurerAdapter{
+
+    public static void main(String[] args) {
+        SpringApplication.run(ibzwfapiApplication.class, args);
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        super.addArgumentResolvers(argumentResolvers);
+        argumentResolvers.add(new cn.ibizlab.util.web.SearchContextHandlerMethodArgumentResolver());
+    }
+}