⬆️ Upgrading dependencies. 升级 spring cloud greenwich.SR1

pigx-auth/src/main/resources/bootstrap.yml

@@ -4,7 +4,6 @@ server:
 spring:
   application:
     name: @artifactId@
-  # 配置中心
   cloud:
     config:
       fail-fast: true
@@ -13,8 +12,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java

@@ -66,6 +66,11 @@ public class RedisAutoCacheManager extends RedisCacheManager {
 		return super.createRedisCache(name, cacheConfig);
 	}
 
+	/**
+	 * 从上下文中获取租户ID，重写@Cacheable value 值
+	 * @param name
+	 * @return
+	 */
 	@Override
 	public Cache getCache(String name) {
 		return super.getCache(TenantContextHolder.getTenantId() + StrUtil.COLON + name);

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java

@@ -40,7 +40,7 @@ public class RedisTemplateConfig {
 	private final RedisConnectionFactory redisConnectionFactory;
 
 	@Bean
-	public RedisTemplate<String, Object> redisTemplate() {
+	public RedisTemplate<String, Object> pigxRedisTemplate() {
 		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
 		redisTemplate.setKeySerializer(new StringRedisSerializer());
 		redisTemplate.setHashKeySerializer(new StringRedisSerializer());

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsService.java

@@ -18,7 +18,6 @@
 package com.pig4cloud.pigx.common.security.service;
 
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
-import lombok.SneakyThrows;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
 import org.springframework.security.oauth2.provider.ClientDetails;
@@ -46,7 +45,6 @@ public class PigxClientDetailsService extends JdbcClientDetailsService {
 	 * @throws InvalidClientException
 	 */
 	@Override
-	@SneakyThrows
 	@Cacheable(value = SecurityConstants.CLIENT_DETAILS_KEY, key = "#clientId", unless = "#result == null")
 	public ClientDetails loadClientByClientId(String clientId) {
 		return super.loadClientByClientId(clientId);

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteLogService.java

@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
  * @author lengleng
  * @date 2018/6/28
  */
-@FeignClient(value = ServiceNameConstants.UMPS_SERVICE)
+@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.UMPS_SERVICE)
 public interface RemoteLogService {
 	/**
 	 * 保存日志

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java

@@ -30,7 +30,7 @@ import java.util.Map;
  * @author lengleng
  * @date 2018/9/4
  */
-@FeignClient(value = ServiceNameConstants.AUTH_SERVICE)
+@FeignClient(contextId = "remoteTokenService", value = ServiceNameConstants.AUTH_SERVICE)
 public interface RemoteTokenService {
 	/**
 	 * 分页查询token 信息

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java

@@ -35,7 +35,7 @@ import java.util.List;
  * @author lengleng
  * @date 2018/6/22
  */
-@FeignClient(value = ServiceNameConstants.UMPS_SERVICE)
+@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.UMPS_SERVICE)
 public interface RemoteUserService {
 	/**
 	 * 通过用户名查询用户、角色信息

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java

@@ -52,7 +52,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 	private final SysRoleMenuMapper sysRoleMenuMapper;
 
 	@Override
-	@Cacheable(value = "menu_details", key = "#roleId  + '_menu'")
+	@Cacheable(value = "menu_details#2000", key = "#roleId  + '_menu'")
 	public List<MenuVO> findMenuByRoleId(Integer roleId) {
 		return baseMapper.listMenusByRoleId(roleId);
 	}

pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml

@@ -15,8 +15,6 @@ spring:
         service-id: pigx-config
   autoconfigure:
     exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 # 注册中心配置

pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml

@@ -15,8 +15,6 @@ spring:
         service-id: pigx-config
   profiles:
     active: dev
-  main:
-    allow-bean-definition-overriding: true
 
 # 注册中心配置
 eureka:

pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml

@@ -13,8 +13,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm

@@ -22,6 +22,7 @@ import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import ${package}.${moduleName}.entity.${className};
 import ${package}.${moduleName}.service.${className}Service;
+import org.springframework.security.access.prepost.PreAuthorize;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,64 +35,67 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/${pathName}")
+@RequestMapping("/${pathName}" )
 public class ${className}Controller {
 
-  private final  ${className}Service ${classname}Service;
+    private final  ${className}Service ${classname}Service;
 
-  /**
-   * 分页查询
-   * @param page 分页对象
-   * @param ${classname} ${comments}
-   * @return
-   */
-  @GetMapping("/page")
-  public R get${className}Page(Page page, ${className} ${classname}) {
-    return  new R<>(${classname}Service.page(page,Wrappers.query(${classname})));
-  }
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param ${classname} ${comments}
+     * @return
+     */
+    @GetMapping("/page" )
+    public R get${className}Page(Page page, ${className} ${classname}) {
+        return new R<>(${classname}Service.page(page, Wrappers.query(${classname})));
+    }
 
 
-  /**
-   * 通过id查询${comments}
-   * @param ${pk.lowerAttrName} id
-   * @return R
-   */
-  @GetMapping("/{${pk.lowerAttrName}}")
-  public R getById(@PathVariable("${pk.lowerAttrName}") ${pk.attrType} ${pk.lowerAttrName}){
-    return new R<>(${classname}Service.getById(${pk.lowerAttrName}));
-  }
+    /**
+     * 通过id查询${comments}
+     * @param ${pk.lowerAttrName} id
+     * @return R
+     */
+    @GetMapping("/{${pk.lowerAttrName}}" )
+    public R getById(@PathVariable("${pk.lowerAttrName}" ) ${pk.attrType} ${pk.lowerAttrName}) {
+        return new R<>(${classname}Service.getById(${pk.lowerAttrName}));
+    }
 
-  /**
-   * 新增${comments}
-   * @param ${classname} ${comments}
-   * @return R
-   */
-  @SysLog("新增${comments}")
-  @PostMapping
-  public R save(@RequestBody ${className} ${classname}){
-    return new R<>(${classname}Service.save(${classname}));
-  }
+    /**
+     * 新增${comments}
+     * @param ${classname} ${comments}
+     * @return R
+     */
+    @SysLog("新增${comments}" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_add')" )
+    public R save(@RequestBody ${className} ${classname}) {
+        return new R<>(${classname}Service.save(${classname}));
+    }
 
-  /**
-   * 修改${comments}
-   * @param ${classname} ${comments}
-   * @return R
-   */
-  @SysLog("修改${comments}")
-  @PutMapping
-  public R updateById(@RequestBody ${className} ${classname}){
-    return new R<>(${classname}Service.updateById(${classname}));
-  }
+    /**
+     * 修改${comments}
+     * @param ${classname} ${comments}
+     * @return R
+     */
+    @SysLog("修改${comments}" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_edit')" )
+    public R updateById(@RequestBody ${className} ${classname}) {
+        return new R<>(${classname}Service.updateById(${classname}));
+    }
 
-  /**
-   * 通过id删除${comments}
-   * @param ${pk.lowerAttrName} id
-   * @return R
-   */
-  @SysLog("删除${comments}")
-  @DeleteMapping("/{${pk.lowerAttrName}}")
-  public R removeById(@PathVariable ${pk.attrType} ${pk.lowerAttrName}){
-    return new R<>(${classname}Service.removeById(${pk.lowerAttrName}));
-  }
+    /**
+     * 通过id删除${comments}
+     * @param ${pk.lowerAttrName} id
+     * @return R
+     */
+    @SysLog("删除${comments}" )
+    @DeleteMapping("/{${pk.lowerAttrName}}" )
+    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_del')" )
+    public R removeById(@PathVariable ${pk.attrType} ${pk.lowerAttrName}) {
+        return new R<>(${classname}Service.removeById(${pk.lowerAttrName}));
+    }
 
 }

pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm

@@ -14,160 +14,134 @@
   - this software without specific prior written permission.
   - Author: lengleng (wangiegie@gmail.com)
   -->
-
 <template>
-  <div class="execution">
-    <basic-container>
-      <avue-crud ref="crud"
-                 :page="page"
-                 :data="tableData"
-                 :table-loading="tableLoading"
-                 :option="tableOption"
-                 @on-load="getList"
-                 @refresh-change="refreshChange"
-                 @row-update="handleUpdate"
-                 @row-save="handleSave"
-                 @row-del="rowDel">
-        <template slot="menuLeft">
-          <el-button type="primary"
-                     @click="handleAdd"
-                     size="small"
-                     v-if="permissions.${moduleName}_${pathName}_add">新 增</el-button>
-          <br /><br />
-        </template>
-        <template slot-scope="scope"
-                  slot="menu">
-          <el-button type="text"
-                     v-if="permissions.${moduleName}_${pathName}_edit"
-                     icon="el-icon-check"
-                     size="small"
-                     plain
-                     @click="handleEdit(scope.row,scope.index)">编辑</el-button>
-          <el-button type="text"
-                     v-if="permissions.${moduleName}_${pathName}_del"
-                     icon="el-icon-delete"
-                     size="small"
-                     plain
-                     @click="handleDel(scope.row,scope.index)">删除</el-button>
-        </template>
-      </avue-crud>
-    </basic-container>
-  </div>
+    <div class="execution">
+        <basic-container>
+            <avue-crud ref="crud"
+                       :page="page"
+                       :data="tableData"
+                       :permission="permissionList"
+                       :table-loading="tableLoading"
+                       :option="tableOption"
+                       @on-load="getList"
+                       @refresh-change="refreshChange"
+                       @row-update="handleUpdate"
+                       @row-save="handleSave"
+                       @row-del="rowDel">
+            </avue-crud>
+        </basic-container>
+    </div>
 </template>
 
 <script>
-  import { fetchList, getObj, addObj, putObj, delObj } from '@/api/${pathName}'
-  import { tableOption } from '@/const/crud/${pathName}'
-  import { mapGetters } from 'vuex'
-  export default {
-    name: '${pathName}',
-    data() {
-      return {
-        tableData: [],
-        page: {
-          total: 0, // 总页数
-          currentPage: 1, // 当前页数
-          pageSize: 20 // 每页显示多少条
+    import {addObj, delObj, fetchList, getObj, putObj} from '@/api/'
+    import {tableOption} from '@/const/crud/'
+    import {mapGetters} from 'vuex'
+
+    export default {
+        name: '${pathName}',
+        data() {
+            return {
+                tableData: [],
+                page: {
+                    total: 0, // 总页数
+                    currentPage: 1, // 当前页数
+                    pageSize: 20 // 每页显示多少条
+                },
+                tableLoading: false,
+                tableOption: tableOption
+            }
         },
-        tableLoading: false,
-        tableOption: tableOption
-      }
-    },
-    created() {
-    },
-    mounted: function() { },
-    computed: {
-      ...mapGetters(['permissions'])
-    },
-    methods: {
-      getList(page, params) {
-        this.tableLoading = true
-        fetchList(Object.assign({
-          current: page.currentPage,
-          size: page.pageSize
-        }, params)).then(response => {
-          this.tableData = response.data.data.records
-          this.page.total = response.data.data.total
-          this.tableLoading = false
-        })
-      },
-      /**
-       * @title 打开新增窗口
-       * @detail 调用crud的handleadd方法即可
-       *
-       **/
-      handleAdd: function() {
-        this.$refs.crud.rowAdd()
-      },
-      handleEdit(row, index) {
-        this.$refs.crud.rowEdit(row, index)
-      },
-      handleDel(row, index) {
-        this.$refs.crud.rowDel(row, index)
-      },
-      rowDel: function(row, index) {
-        var _this = this
-        this.$confirm('是否确认删除ID为' + row.$pk.lowerAttrName, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(function() {
-            return delObj(row.$pk.lowerAttrName)
-          }).then(data => {
-          _this.tableData.splice(index, 1)
-          _this.$message({
-            showClose: true,
-            message: '删除成功',
-            type: 'success'
-          })
-          this.getList(this.page)
-        }).catch(function(err) { })
-      },
-      /**
-       * @title 数据更新
-       * @param row 为当前的数据
-       * @param index 为当前更新数据的行数
-       * @param done 为表单关闭函数
-       *
-       **/
-      handleUpdate: function(row, index, done) {
-        putObj(row).then(data => {
-          this.tableData.splice(index, 1, Object.assign({}, row))
-          this.$message({
-            showClose: true,
-            message: '修改成功',
-            type: 'success'
-          })
-          done()
-          this.getList(this.page)
-        })
-      },
-      /**
-       * @title 数据添加
-       * @param row 为当前的数据
-       * @param done 为表单关闭函数
-       *
-       **/
-      handleSave: function(row, done) {
-        addObj(row).then(data => {
-          this.tableData.push(Object.assign({}, row))
-          this.$message({
-            showClose: true,
-            message: '添加成功',
-            type: 'success'
-          })
-          done()
-          this.getList(this.page)
-        })
-      },
-      /**
-       * 刷新回调
-       */
-      refreshChange() {
-        this.getList(this.page)
-      }
+        created() {
+        },
+        mounted: function () {
+        },
+        computed: {
+            ...mapGetters(['permissions']),
+            permissionList() {
+                return {
+                    addBtn: this.vaildData(this.permissions.${moduleName}_${pathName}_add, false),
+                    delBtn: this.vaildData(this.permissions.${moduleName}_${pathName}_del, false),
+                    editBtn: this.vaildData(this.permissions.${moduleName}_${pathName}_edit, false)
+                };
+            }
+        },
+        methods: {
+            getList(page, params) {
+                this.tableLoading = true
+                fetchList(Object.assign({
+                    current: page.currentPage,
+                    size: page.pageSize
+                }, params)).then(response => {
+                    this.tableData = response.data.data.records
+                    this.page.total = response.data.data.total
+                    this.tableLoading = false
+                })
+            },
+            rowDel: function (row, index) {
+                var _this = this
+                this.$confirm('是否确认删除ID为' + row.$pk.lowerAttrName, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(function () {
+                    return delObj(row.$pk.lowerAttrName)
+                }).then(data => {
+                    _this.tableData.splice(index, 1)
+                    _this.$message({
+                        showClose: true,
+                        message: '删除成功',
+                        type: 'success'
+                    })
+                    this.getList(this.page)
+                }).catch(function (err) {
+                })
+            },
+            /**
+             * @title 数据更新
+             * @param row 为当前的数据
+             * @param index 为当前更新数据的行数
+             * @param done 为表单关闭函数
+             *
+             **/
+            handleUpdate: function (row, index, done) {
+                putObj(row).then(data => {
+                    this.tableData.splice(index, 1, Object.assign({}, row))
+                    this.$message({
+                        showClose: true,
+                        message: '修改成功',
+                        type: 'success'
+                    })
+                    done()
+                    this.getList(this.page)
+                })
+            },
+            /**
+             * @title 数据添加
+             * @param row 为当前的数据
+             * @param done 为表单关闭函数
+             *
+             **/
+            handleSave: function (row, done) {
+                addObj(row).then(data => {
+                    this.tableData.push(Object.assign({}, row))
+                    this.$message({
+                        showClose: true,
+                        message: '添加成功',
+                        type: 'success'
+                    })
+                    done()
+                    this.getList(this.page)
+                })
+            },
+            /**
+             * 刷新回调
+             */
+            refreshChange() {
+                this.getList(this.page)
+            }
+        }
     }
-  }
 </script>
 
 <style lang="scss" scoped>

pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml

@@ -13,8 +13,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java

@@ -34,7 +34,6 @@ import org.aspectj.lang.annotation.Aspect;
 import org.quartz.Trigger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Component;
 
 import java.time.ZoneId;
 import java.util.Date;
@@ -46,10 +45,8 @@ import java.util.Date;
  */
 @Slf4j
 @Aspect
-@Component
 @RequiredArgsConstructor
 public class TaskInvokUtil {
-
 	private final ApplicationEventPublisher publisher;
 
 	@Autowired

pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml

@@ -16,8 +16,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml

@@ -13,8 +13,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml

@@ -13,8 +13,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml

@@ -13,8 +13,6 @@ spring:
       discovery:
         enabled: true
         service-id: pigx-config
-  main:
-    allow-bean-definition-overriding: true
   profiles:
     active: dev
 

pom.xml

@@ -43,7 +43,7 @@
 
 	<properties>
 		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
-		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
 		<spring-platform.version>Cairo-SR7</spring-platform.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>