修改pom文件和配置文件

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>3.2.1_WF_A_beta3</version>
+            <version>3.2.1_WF_A_beta4</version>
             <!--            <version>3.0.0_nlt.25</version>-->
             <!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
         </dependency>

src/main/java/org/rcisoft/bus/storegoodsstock/controller/StoreGoodsStockController.java

@@ -77,7 +77,7 @@ public class StoreGoodsStockController extends CyPaginationController<StoreGoods
         businessId);
     }
 
-    //@PreAuthorize("@cyPerm.hasPerm('sys:goodsStock:update')")
+    @PreAuthorize("@cyPerm.hasPerm('sys:goodsStock:update')")
     @CyOpeLogAnno(title = "system-库存管理表管理-修改库存管理表", businessType = CyLogTypeEnum.UPDATE)
     @ApiOperation(value="修改库存管理表", notes="修改库存管理表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@@ -91,7 +91,7 @@ public class StoreGoodsStockController extends CyPaginationController<StoreGoods
                 storeGoodsStock);
     }
 
-    @PreAuthorize("@cyPerm.hasPerm('sys:user:add')")
+
     @CyOpeLogAnno(title = "system-库存管理表管理-修改库存管理表", businessType = CyLogTypeEnum.UPDATE)
     @ApiOperation(value="修改库存管理表", notes="修改库存管理表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})

src/main/resources/application-common.yml

@@ -238,3 +238,86 @@ snowflake:
   moduleId: ${SNOWFLAKE_MODULE_ID:000}
   # 部署节点id
   nodeId: ${SNOWFLAKE_NODE_ID:00000}
+
+rocketmq:
+  # 服务地址，多个用逗号分开
+  name-server: ${cy_rocketMq.ns}
+  producer:
+    # 发送消息超时时间，默认3000
+    send-message-timeout: 30000
+    # 生产者组
+    group: springboot_producer_group
+    # 发送消息失败重试次数，默认2
+    retryTimesWhenSendFailed: 2
+    # 异步消息重试此处，默认2
+    retryTimesWhenSendAsyncFailed: 2
+    # 消息最大长度，默认1024 * 1024 * 4(默认4M)
+    maxMessageSize: 4096
+    # 压缩消息阈值，默认4k(1024 * 4)
+    compressMessageBodyThreshold: 4096
+    # 是否在内部发送失败时重试另一个broker，默认false
+    retryNextServer: false
+  consumer:
+    group: springboot_consumer_group
+    # 一次拉取消息最大值，注意是拉取消息的最大值而非消费最大值
+    pull-batch-size: 10
+
+global:
+  default_location:
+    #ossinfo id
+    course: 1
+    student: /default/student.png
+    teacher: 2
+    carousel: /default/carousel.jpg
+    news: 3
+  lk:
+    publicalias: publiccert
+    storePwd: rcrtcyedu2
+    subject: edu2
+    licPath: /lk/license.lic
+    pubPath: /lk/publicCerts.store
+  password:
+    default: 123456
+    min_password: 6
+    max_password: 16
+  path:
+    base_upload_server_location: /Users/lyl/Downloads/eduServer
+    physical_upload_server_location: /Users/lyl/Downloads/eduServer
+    course_location: course
+    lesson_location: lesson
+    sl_location: sl
+    freemarker_location: /freemarker
+    image_location: /upload
+    video_location: video
+    temp_location: temp
+    file_location: file
+    ppt_location: ppt
+    pdf_location: pdf
+    cut_pdf_location: cutPdf
+    excel_template_location: excel-template/
+    cource_logo_location: /course/logo
+    images_location: /images
+    lanch_logo_location: /lanch/logo
+    md_file_location: mdFiles
+    che_def_template_location: /WEB-INF/classes/che-def-jsonfile/java-mysql.json
+    che_project_init_location: /working/dockervolume/chedir/project
+    cource_code_location: code
+    cource_project_location: project
+    student_code_location: studentCode
+    xml_location: /xmlTemp
+  other:
+    server_url: http://106.2.3.134:10180/eduServer
+    is_server_linux: 5
+    max_code_length: 15
+    open_office_home: D:/oppenOffice/openOffice
+    cut_pdf_num: 30
+  code:
+    admin: ROLE_1001
+    teacher: ROLE_1002
+    student: ROLE_1003
+    java: '001'
+    html: '002'
+    java_simple: '0001'
+    java_project: '0002'
+    html_simple: '1001'
+    html_project: '1002'

src/main/resources/application-dev-conf.yml

@@ -27,6 +27,10 @@ cy_mq:
 #  password: cy
 #  db: wms_db
 
+# 3. rocketMq   使用 ;  分隔
+cy_rocketMq:
+  ns: 106.3.97.198:9876;106.3.99.36:9876
+
 cy_db:
   ip: 127.0.0.1
   port: 3306
@@ -85,7 +89,7 @@ cy:
       secure: false
     security:
       enable: true
-      permission: false
+      permission: true
       defaultFilter: true
       gateway: false
       acAllowOrigin: '*'
@@ -169,6 +173,20 @@ sms:
     accountToken: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
     appId: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+global:
+  path:
+    base_upload_location: E:\working\resource\eduServer\
+    #    base_upload_location: /working/resource/eduServer/
+    base_discovery: 'http://192.168.1.12:8888/eduServer/'
+    fileUploadFormatRestrictions: ".exe,.php,.asp,.jsp,.aspx"
+    code_generate_location: /code
+    video_location: /video
+    temp_location: /temp
+    file_location: /file
+    images_location: /images
+  code:
+    admin: ROLE_1001
+  resetPassword: 123456
 
 logging:
   level:

src/main/resources/application-spbt.yml

@@ -39,6 +39,11 @@ cy:
     dbChange: true
     redisCluster: false
     entityParam: true
+    #token
+    token:
+      mode: false
+      #过期超时时间
+      ttl: 3600
     # md5
     decryptParam: false
     decryptKey: cyKey