配置文件提交

raising-admin-pro/src/main/resources/application-company.yml

@@ -80,12 +80,16 @@ spring:
       # 主库数据源
       master:
         # IP
-#        url: jdbc:mysql://192.168.1.222:10318/hikari_pos_v1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://192.168.1.222:10318/hikari_pos_v1?useUnicode=true&characterEncoding=utf8&zeromallapi/deviceReport/addDateTimeBehavior=convertToNull&useSSL=true&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
 #        username: hikari_pos_v1
 #        password: YbyBaZrMfefWksbX
-        url: jdbc:mysql://127.0.0.1:3306/hikari-pos?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+#        url: jdbc:mysql://127.0.0.1:3306/hikari_pos_v1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
+#        username: root
+#        password: 123456mallapi/deviceReport/add
+        # 阿里云服务器内部数据库
+        url: jdbc:mysql://${RS_MYSQL_DB_HOST:10.40.4.196}:${RS_MYSQL_DB_PORT:3306}/${RS_MYSQL_DB_NAME:hikari-pos}?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+        username: ${RS_MYSQL_DB_USER:hikaripos}
+        password: ${RS_MYSQL_DB_PWD:kzm66fN4hjFpnMJ2}
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

raising-admin-pro/src/main/resources/application.yml

@@ -3,9 +3,13 @@ spring:
   #main:
     # 允许Bean重名
     #allow-bean-definition-overriding: true
-  profiles:
+#  profiles:
+#    # dev  company  qa  prd
+#    active: ${RS_SPRING_PROFILES_ACTIVE:company}
+
+    profiles:
     # dev  company  qa  prd
-    active: ${RS_SPRING_PROFILES_ACTIVE:company}
+    active: ${RS_SPRING_PROFILES_ACTIVE:daou-prd}
 
 
 # 租户信息配置

raising-vue-uniapp/App.vue

@@ -36,6 +36,7 @@
 			// 原生app版本更新检测
 			// #ifdef APP-PLUS
 			plus.screen.lockOrientation('landscape-primary'); // 强制横屏
+			// plus.screen.lockOrientation('portrait-primary'); // 强制竖着屏
 			APPUpdate();
 			// const ToastPlusModule = uni.requireNativePlugin("unitest")
 			// ToastPlusModule.init();
@@ -88,17 +89,17 @@
 
 
 				// #ifdef H5
-				let virtualDeviceId = "E482782E63464BE4B285F4F5BD5CA463"
+				let virtualDeviceId = "615C6C2FEE6FA59746B3B06FCCD29E5A"
 				this.$log('H5模拟IPAD == device-id: ' + virtualDeviceId)
 				info.deviceId = virtualDeviceId
 				// #endif
 				
 				// 打包IPhone端固定死设备ID (从IPAD设备中选择一个ID就可以)
-				if(true){
-					let virtualDeviceId = "E482782E63464BE4B285F4F5BD5CA463"
-					console.log('IPHONE模拟IPAD == device-id: ' + virtualDeviceId)
-					info.deviceId = virtualDeviceId
-				}
+				// if(true){
+				// 	let virtualDeviceId = "F71AE62982C20B657268C6FDCCC285AD"
+				// 	console.log('IPHONE模拟IPAD == device-id: ' + virtualDeviceId)
+				// 	info.deviceId = virtualDeviceId
+				// }
 
 				console.log('system: ', info.system)
 				console.log('model: ', info.model)

raising-vue-uniapp/config/env.js

@@ -44,9 +44,11 @@ export default {
 	// basePath: 'https://rs-wx-api.rasing.vip',
 	// basePath: 'https://api.daouservice.com',
 	// basePath: 'https://daou-service-app.oss-cn-hangzhou.aliyuncs.com',
-	basePath: 'http://192.168.1.47:8151',
+	// basePath: 'http://192.168.1.47:8151',
+	basePath: 'http://api.cloudregi.com',
 	// basePath: 'http://192.168.5.199:8151',
 	
+	
 	/**
 	 * Websocket接口地址
 	 */

raising-vue-uniapp/upms/views/menu/menu.vue

@@ -483,7 +483,7 @@
 
             <block v-if="orderTab == 1">
               <view class="order-close-btn">
-                <button @click="$refs.orderPopup.close()"{{ languageConversion("关 闭") }}></button>
+                <button @click="$refs.orderPopup.close()">{{ languageConversion("关 闭") }}</button>
               </view>
             </block>
 

raising-vue-uniapp/utils/api.js

@@ -34,7 +34,7 @@ const request = (url, method, data, showLoading) => {
 				// 'client-type': validatenull(shopId) ? 'OM-HALL' : 'OM-SHOP', //点餐机类型 大厅的/门店内
 				// 'device-id': "1f82c7ab30405ebf", //点餐机-唯一设备编号
 				"client-type": "OM-SHOP",
-				"device-id": "E482782E63464BE4B285F4F5BD5CA463",
+				"device-id": "0369E2FE48919344005E364491A7D614",
 				"switch-token": "",
 				"shop-id": "1631454886708219906",
 				//#endif