Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-server/src/main/resources/application-local.yaml

@@ -1,7 +1,5 @@
 server:
   port: 48080
-  servlet:
-    context-path: /cyywl-api
 
 --- #################### 数据库相关配置 ####################
 

yudao-server/src/main/resources/logback-spring.xml

@@ -66,7 +66,7 @@
     </springProfile>
     <!-- 其它环境 -->
     <springProfile name="dev,test,stage,prod,default">
-        <root level="DEBUG">
+        <root level="INFO">
             <appender-ref ref="STDOUT"/>
             <appender-ref ref="ASYNC"/>
             <appender-ref ref="GRPC"/>

yudao-ui-admin/.env.prod

@@ -5,11 +5,11 @@ ENV = 'production'
 VUE_APP_TITLE = 创盈商户管理系统
 
 # 创盈管理系统/生产环境
-VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/admin-api'
+VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
 #VUE_APP_BASE_API = 'http://192.168.2.71'
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://192.168.2.71/'
+PUBLIC_PATH = 'https://cmx.bskies.cc:8000/cy-admin/'
 # 二级部署路径
 VUE_APP_APP_NAME ='/cy-admin/'