Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
c1988aae
Commit
c1988aae
authored
Apr 27, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配置文件修改
parent
6e6be1d3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
12 deletions
+20
-12
ConfigValue.json
Mall.ThirdCore/ConfigValue.json
+1
-1
EmployeeController.cs
Mall.WebApi/Controllers/User/EmployeeController.cs
+9
-1
Mall.WebApi.csproj.user
Mall.WebApi/Mall.WebApi.csproj.user
+1
-1
appsettings.json
Mall.WebApi/appsettings.json
+5
-5
appsettings2.json
Mall.WebApi/appsettings2.json
+1
-1
appsettings.json
Mall.WindowsService/appsettings.json
+2
-2
App.config
Test/App.config
+1
-1
No files found.
Mall.ThirdCore/ConfigValue.json
View file @
c1988aae
...
...
@@ -15,5 +15,5 @@
"masterSecret"
:
"dda819c1de00c64ae0fad4c7"
},
//消息推送rabbit配置(ip
,
端口
,
账号
,
密码
,
推送队列名)
"WebPushRabbitConfig"
:
"192.168.
1
.214,5672,rbAdmin,rbadmin123456,WebPushRabbitMQ"
"WebPushRabbitConfig"
:
"192.168.
20
.214,5672,rbAdmin,rbadmin123456,WebPushRabbitMQ"
}
Mall.WebApi/Controllers/User/EmployeeController.cs
View file @
c1988aae
...
...
@@ -149,7 +149,15 @@ namespace Mall.WebApi.Controllers.User
/// <returns></returns>
public
ApiResult
SetEmployee
()
{
var
extModel
=
JsonConvert
.
DeserializeObject
<
RB_Employee_Extend
>(
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
extModel
=
new
RB_Employee_Extend
()
{
EmpId
=
parms
.
GetInt
(
"EmpId"
),
EmpAccount
=
parms
.
GetStringValue
(
"EmpAccount"
),
EmpName
=
parms
.
GetStringValue
(
"EmpName"
),
EmpPwd
=
parms
.
GetStringValue
(
"EmpPwd"
),
RoleAuth
=
parms
.
GetStringValue
(
"RoleAuth"
),
};
extModel
.
Status
=
0
;
extModel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
extModel
.
TenantId
=
RequestParm
.
TenantId
;
...
...
Mall.WebApi/Mall.WebApi.csproj.user
View file @
c1988aae
...
...
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>
True
</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile
/>
<WebStackScaffolding_IsAsyncSelected>
False
</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>
E:\Work\Mall_Api\Mall.WebApi\Properties\PublishProfiles\mallapi.oytour.com.pubxml
</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>
mallapi.oytour.com
</NameOfLastUsedPublishProfile>
<ShowAllFiles>
false
</ShowAllFiles>
</PropertyGroup>
</Project>
\ No newline at end of file
Mall.WebApi/appsettings.json
View file @
c1988aae
{
"ConnectionStrings"
:
{
"DefaultConnection"
:
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"DefaultConnection"
:
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"FinanceConnection"
:
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
,
"UserConnection"
:
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"UserConnection"
:
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"UserConnectionPName"
:
"MySql.Data.MySqlClient"
,
"PropertyConnection"
:
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"PropertyConnection"
:
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; "
,
"PropertyConnectionPName"
:
"MySql.Data.MySqlClient"
},
"Logging"
:
{
...
...
@@ -26,7 +26,7 @@
"ApiExpirTime"
:
2592000
,
"AllowedHosts"
:
"*"
,
"OpenValidation"
:
"False"
,
"UploadSiteUrl"
:
"http://192.168.
1
.214:8120"
,
"UploadSiteUrl"
:
"http://192.168.
20
.214:8120"
,
"ViewFileSiteUrl"
:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com"
,
"AliFileSiteUrl"
:
"https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com"
,
"ImKey"
:
"b612b31e837c79c68f141aeb719d2b20"
,
...
...
Mall.WebApi/appsettings2.json
View file @
c1988aae
...
...
@@ -15,7 +15,7 @@
"ApiExpirTime"
:
2592000
,
"AllowedHosts"
:
"*"
,
"OpenValidation"
:
"False"
,
"UploadSiteUrl"
:
"http://192.168.
1
.214:8120"
,
"UploadSiteUrl"
:
"http://192.168.
20
.214:8120"
,
"ViewFileSiteUrl"
:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com"
,
"ImKey"
:
"b612b31e837c79c68f141aeb719d2b20"
,
"ImSecret"
:
"66000451fb72"
,
...
...
Mall.WindowsService/appsettings.json
View file @
c1988aae
{
"ConnectionStrings"
:
{
"DefaultConnection"
:
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; "
,
"DefaultConnection"
:
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; "
,
"FinanceConnection"
:
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; "
,
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
},
"Logging"
:
{
...
...
Test/App.config
View file @
c1988aae
...
...
@@ -4,7 +4,7 @@
<
supportedRuntime
version
=
"v4.0"
sku
=
".NETFramework,Version=v4.6"
/>
</
startup
>
<
connectionStrings
>
<
add
name
=
"DefaultConnection"
providerName
=
"MySql.Data.MySqlClient"
connectionString
=
"server=192.168.
1
.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; "
/>
<
add
name
=
"DefaultConnection"
providerName
=
"MySql.Data.MySqlClient"
connectionString
=
"server=192.168.
20
.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; "
/>
</
connectionStrings
>
<
system
.
data
>
<
DbProviderFactories
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment