达梦前版本

pom.xml

@@ -275,7 +275,7 @@
     </dependencies>
 
     <build>
-        <finalName>subsidy</finalName>
+        <finalName>elecSubsidy</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/subsidy/controller/MemberController.java

@@ -208,7 +208,7 @@ public class MemberController {
 
     @PostMapping("getStudyInfo")
     @ApiOperation("获取学生完成课程情况  id 学员id")
-    @LoginRequired
+//    @LoginRequired
     @TimeRequired
     public ResponseVO getStudyInfo(@RequestBody MemberDO memberDO){
         return ResponseData.generateCreatedResponse(0,memberService.getStudyInfo(memberDO));

src/main/resources/application-dev.properties

 # 本地环境配置
-spring.server.port=23457
+spring.server.port=23513
 
 # 数据源配置
-spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_new?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://116.62.57.92:3306/elec_subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.username=ykadmin_new
@@ -11,13 +10,6 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=devloper
 spring.datasource.password=dev@1553$
 
-# 数据源配置
-#spring.datasource.url=jdbc:mysql://139.224.253.21:3306/subsidy_new?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.username=root
-#spring.datasource.password=ykhladmin302
-
 spring.datasource.druid.initialSize=5
 spring.datasource.druid.minIdle=5
 spring.datasource.druid.maxActive=200

src/main/resources/application-online.properties

-# 本地环境配置
-spring.server.port=23462
-
-# 数据源配置
-spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.username=ykadmin_new
-#spring.datasource.password=youkedb608@good
-spring.datasource.username=devloper
-spring.datasource.password=dev@1553$
-
-spring.datasource.druid.initialSize=5
-spring.datasource.druid.minIdle=5
-spring.datasource.druid.maxActive=200
-spring.datasource.druid.maxWait=60000
-spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-spring.datasource.druid.minEvictableIdleTimeMillis=300000
-spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.druid.testWhileIdle=true
-spring.datasource.druid.testOnBorrow=false
-spring.datasource.druid.testOnReturn=false
-spring.datasource.druid.poolPreparedStatements=true
-spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-spring.datasource.druid.useGlobalDataSourceStat=true
-
-# 控制台日志打印
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-
-#spring.redis.host=r-uf6meywj6ysuehg148pd.redis.rds.aliyuncs.com
-#spring.redis.password=r-uf6meywj6ysuehg148:Ykhl@208
-#spring.redis.port=6379
-#spring.redis.lettuce.pool.max-idle=16
-#spring.redis.lettuce.pool.max-active=32
-#spring.redis.lettuce.pool.min-idle=8
-
-#spring.application.name=spring-boot-mongodb
-## mongodb
-##spring.data.mongodb.uri=mongodb://47.97.19.66:27017/subsidy
-#spring.data.mongodb.username=root
-#spring.data.mongodb.password=123456
-##spring.data.mongodb.authentication-database=subsidy
-#spring.data.mongodb.database=subsidy
-#spring.data.mongodb.host=47.97.19.66
-#spring.data.mongodb.port=27017
-
-spring.redis.host=47.97.19.66
-spring.redis.password=Ykhl@208
-spring.redis.port=6389
-spring.redis.lettuce.pool.max-idle=16
-spring.redis.lettuce.pool.max-active=32
-spring.redis.lettuce.pool.min-idle=8
-
-qxueyou.appId=qxywz5nnWMI77CM3Tx
-qxueyou.securityKey=626737T1-65K0-5xC2-0Y0V-2Aq95qxy
-qxueyou.url=https://dev.qxueyou.com/auth/user/token
-
-renshe.url = https://api.shzypxy.com
-renshe.secretKey = 111
\ No newline at end of file

src/main/resources/application-prod.properties

 # 生产环境配置
-spring.server.port=23459
+spring.server.port=23515
 
 # 数据源配置
-#spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://rm-uf62202s176hufw8x0o.mysql.rds.aliyuncs.com:3306/subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://rm-uf62202s176hufw8x0o.mysql.rds.aliyuncs.com:3306/elec_subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=ykadmin_new

src/main/resources/mapper/BusinessScopeDictMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryBusinessScopePage" resultType="com.subsidy.vo.businessScope.BusinessScopeDictVO">
         SELECT * FROM business_scope_dict
         <where>
-            <if test="businessScopeName != null">
+            <if test="businessScopeName != null and businessScopeName != ''">
                 AND business_scope_name LIKE concat('%', #{businessScopeName} ,'%')
             </if>
             <if test="companyId != null and companyId != ''">