update

pom.xml

@@ -156,7 +156,14 @@
                     <include>**/*.*</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
         </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/mokamrp/privates/controller/UserCorpController.java

@@ -74,7 +74,6 @@ public class UserCorpController {
         return AjaxResult.success(Constants.SUCCESS);
     }
 
-
     @GetMapping("/getUserCorpsByUserId")
     public Object getUserCorpsByUserId(@RequestParam(name = "userId") String UserId){
         if (UserId == null || UserId.isEmpty()){

src/main/resources/application.properties

@@ -1,43 +1,5 @@
 spring.application.name=moka-private
 server.port=8085
-<<<<<<< HEAD
-
-
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://rm-uf618jc32u2o80g55oo.mysql.rds.aliyuncs.com:3306/mochat
-spring.datasource.username=typer
-spring.datasource.password=jch9sh_shl
-spring.datasource.max-idle=10
-spring.datasource.max-wait=10000
-spring.datasource.min-idle=5
-spring.datasource.initial-size=5
-
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis-plus.configuration.map-underscore-to-camel-case=true
-
-spring.redis.host=r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com
-spring.redis.port=6379
-spring.redis.password=Jch9shshl
-spring.redis.database=7
-spring.redis.timeout=10s
-spring.redis.jedis.pool.min-idle=0
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-active=20
-spring.redis.jedis.pool.max-wait=-1ms
-
-#阿里云oss配置(增加一个cdn地址配置)
-aliyun.host=https://mini-short-video-test.oss-cn-hangzhou.aliyuncs.com/
-aliyun.endpoint=https://oss-cn-hangzhou.aliyuncs.com
-aliyun.accessKeyId=LTAI4FnmkS1SNFkaKb4YZ1ga
-aliyun.accessKeySecret=irLfHOni7ffLU3yAf3LsKEXwQLfrNc
-aliyun.bucketName=mini-short-video-test
-spring.servlet.multipart.max-request-size=10MB
-spring.servlet.multipart.max-file-size=10MB
-
-xxl.sso.server=http://sso.mokamrp.com:8888/sso
-xxl.sso.logout.path=/logout
-xxl-sso.excluded.paths=
-xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 
 server.servlet.context-path=/private
 spring.profiles.active=${profileActive}